From 271917eb92339ef637e2348268be5a7de712f670 Mon Sep 17 00:00:00 2001
From: Atsuihsio <842960157@qq.com>
Date: Thu, 12 Sep 2024 06:08:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=81=AB=E7=82=AEHUD?=
 =?UTF-8?q?=E7=9A=84=E6=A0=87=E5=B0=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../client/screens/CannonHudOverlay.java      |   5 +++--
 .../superbwarfare/entity/Mle1934Entity.java   |   4 ++--
 .../screens/cannon/cannon_crosshair.png       | Bin 2187 -> 5894 bytes
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/net/mcreator/superbwarfare/client/screens/CannonHudOverlay.java b/src/main/java/net/mcreator/superbwarfare/client/screens/CannonHudOverlay.java
index bb2a47491..f0e7d7f42 100644
--- a/src/main/java/net/mcreator/superbwarfare/client/screens/CannonHudOverlay.java
+++ b/src/main/java/net/mcreator/superbwarfare/client/screens/CannonHudOverlay.java
@@ -40,19 +40,20 @@ public class CannonHudOverlay {
             float xRotOffset = Mth.lerp(event.getPartialTick(), player.xRotO, player.getXRot());
             float diffY = Objects.requireNonNull(player.getVehicle()).getViewYRot(event.getPartialTick()) - yRotOffset;
             float diffX = Objects.requireNonNull(player.getVehicle()).getViewXRot(event.getPartialTick()) - xRotOffset + 1.3f;
+            float fovAdjust = (float) 70 / Minecraft.getInstance().options.fov().get();
             if (diffY > 180.0f) {
                 diffY -= 360.0f;
             } else if (diffY < -180.0f) {
                 diffY += 360.0f;
             }
             float f = (float)Math.min(w, h);
-            float f1 = Math.min((float)w / f, (float)h / f);
+            float f1 = Math.min((float)w / f, (float)h / f) * fovAdjust;
             int i = Mth.floor(f * f1);
             int j = Mth.floor(f * f1);
             int k = (w - i) / 2;
             int l = (h - j) / 2;
             preciseBlit(event.getGuiGraphics(), new ResourceLocation(ModUtils.MODID, "textures/screens/cannon/cannon_crosshair.png"), k, l, 0, 0.0F, i, j, i, j);
-            preciseBlit(event.getGuiGraphics(), new ResourceLocation(ModUtils.MODID, "textures/screens/cannon/indicator.png"), k + 13 * diffY, l + 17 * diffX, 0, 0.0F, i, j, i, j);
+            preciseBlit(event.getGuiGraphics(), new ResourceLocation(ModUtils.MODID, "textures/screens/cannon/indicator.png"), k + 15.6f * diffY * fovAdjust, l + 20.4f * diffX * fovAdjust, 0, 0.0F, i, j, i, j);
         }
         RenderSystem.depthMask(true);
         RenderSystem.defaultBlendFunc();
diff --git a/src/main/java/net/mcreator/superbwarfare/entity/Mle1934Entity.java b/src/main/java/net/mcreator/superbwarfare/entity/Mle1934Entity.java
index 896c2fdc0..54641ccf5 100644
--- a/src/main/java/net/mcreator/superbwarfare/entity/Mle1934Entity.java
+++ b/src/main/java/net/mcreator/superbwarfare/entity/Mle1934Entity.java
@@ -252,7 +252,7 @@ public class Mle1934Entity extends PathfinderMob implements GeoEntity, ICannonEn
             entityToSpawnLeft.setPos(this.getX() + leftPos.x,
                     this.getEyeY() - 0.2 + leftPos.y,
                     this.getZ() + leftPos.z);
-            entityToSpawnLeft.shoot(this.getLookAngle().x, this.getLookAngle().y, this.getLookAngle().z, 18, 0.05f);
+            entityToSpawnLeft.shoot(this.getLookAngle().x, this.getLookAngle().y, this.getLookAngle().z, 15, 0.05f);
             level.addFreshEntity(entityToSpawnLeft);
 
             //右炮管
@@ -267,7 +267,7 @@ public class Mle1934Entity extends PathfinderMob implements GeoEntity, ICannonEn
                 entityToSpawnRight.setPos(this.getX() + rightPos.x,
                         this.getEyeY() - 0.2 + rightPos.y,
                         this.getZ() + rightPos.z);
-                entityToSpawnRight.shoot(this.getLookAngle().x, this.getLookAngle().y, this.getLookAngle().z, 18, 0.05f);
+                entityToSpawnRight.shoot(this.getLookAngle().x, this.getLookAngle().y, this.getLookAngle().z, 15, 0.05f);
                 level.addFreshEntity(entityToSpawnRight);
 
                 player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> capability.recoilHorizon = 1);
diff --git a/src/main/resources/assets/superbwarfare/textures/screens/cannon/cannon_crosshair.png b/src/main/resources/assets/superbwarfare/textures/screens/cannon/cannon_crosshair.png
index c11ce5e7141ed56ab8b355960597cdd2ed617c59..43e0ebe63497c78af3ec4987fd6e8a19af84eba6 100644
GIT binary patch
literal 5894
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
OTel{1^_Qyz`~C+BMRq~}

literal 2187
zcmeHH`%l|d9Q}NutUP3`LQ-&P%f<qz+sH%*3N2+YN_C<^O<+uli#!&QhviYfm9`@@
z;G>}YKu{QuKr&4jY%3E9tu14YZPZZ+;V~$PwWFlP(v?zZq4jnoEc*jUO!Ou<_uk~(
zo6k9)bMBY#q_X{epZ5g-e@;qL8h{7ddVu#nw5;(b>}c^RPRZZ__yxEp20t_h0eCYw
zNeS=qn^!brg-!W^UyNyAG`a4ne!KW%*<g3zELrq1hZoR!pBt{cznE9ye(eA8A5&nX
zR%cO2uQO@O#)U|OHt-lbQhYhHLFeLae%h~UHVFzV<Hlzc+{xkdTd(6-^G*3Jmr-j=
zUl_GZjK<b#>vmUbcuNvwXEfw6-*ru%TAUfaV(K>x=z^oGq$1j+P1YJNY^>{`C`UB0
z%hY(AnY~##F`%*}%h{r=T9GNHNM*TXvz4_k<q7_Xno$VDS~l}6Q8S*a&eL#``L<qh
z_7i)_R_8GNBg;Pdk&&Tr%zd%-&m~Df0N~xDc7s%7=FwfXO^QqLp@f31j66piRZ-a-
zoh!3Aow^$>*3JdTXZ(jH28Yuuva%sv<T<zTpwAU=pjRl(Qjuc*!%CS?0ObDN`qwB^
zSZ8HSn<%ys-6Q?ddY&t;i*zUb;ams9Adu)RsS0aFf0^;}YmS8>JMe!JP|7L7r%V&$
z-?N?2m>iLxw&`1<sLcXc#Zg`fJ^<vy0IY8jI>7_h3Y<J;B-g7rqQ}V^nKFo`Wc$63
zhPgp2iK8z^@!luAqQ&8bFi=a&Iw~yHK^Q<40j2smfRGdr(-<I@#FIOS&=`zTpHjcx
z&L%;&2PEJC2>aDuWA$3S7ewB${pzxp39yixclT2VsPNJUpk90y@#Wank6!hd)?<w&
zZ;77~KwFM{kQ?t;tgQ~Jd&~gDAv=`xGdN{+-El!Vd(BKdQ$7Ht!1@}=Mc_EpQdPk^
z{6b^Z_#nkJdd=3sWZ1pv)}qZ#T1&d6#~}AMqFmousUP!%MkF*1SO|OQiEev?wa4I?
z^34^wNg>o^K~3@X#Nk4s@(l`<@=-kr^~~PSC2#_V+_M28Lo~?GC|aEw^_bf@csq2r
zn~y2sKhJx~wuK?9<po<88Z^g%3hHynItk;<wIfkY4Cp43(V3AMjYo@WkjBUcyIQzO
zPj7f0$3gu4aSX(V&(rZWfG{9;5`hfRw&z$T^7?9;z~t!R_EF$avr&C*7P~s`1ymY_
zy3t8G$_*7uXyV{0!kw!`I5T-*%PNIvVU5}QX=k@wslbX9bZ;5;fT%5}&yPif-bQzF
zdP$5CRW3<vz%HWxj!sJEf2W^&V)Gpl5$O|7);BcB&OMDJ;ykE!C&dQ{%NQVR#7=zn
z4%>!4JCIGxJDi586)&-Ocx<V$9J)#|RyEt5?&ZW0`91CwD&=21_+2g-jMc}qf0udJ
PT_)#LYEt*f?5ckNG9oT@