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:
Atsuihsio 2024-07-18 16:56:00 +08:00
parent 1ed281731f
commit 68ba553b54
4 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/net/mcreator/target/client/screens/M79UIOverlay.java
View file

@ -50,6 +50,7 @@ public class M79UIOverlay {
private static boolean shouldRenderCrossHair2(Player player) { private static boolean shouldRenderCrossHair2(Player player) {
if (player == null) return false; if (player == null) return false;
return !player.isSpectator() return !player.isSpectator()
&& Minecraft.getInstance().options.getCameraType() == CameraType.THIRD_PERSON_BACK && (player.isPassenger() && player.getVehicle() instanceof Mk42Entity); && !(player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zoom
&& player.isPassenger() && player.getVehicle() instanceof Mk42Entity;
} }
} }

6
src/main/java/net/mcreator/target/client/screens/Mk42UIOverlay.java
View file

@ -4,6 +4,7 @@ import com.mojang.blaze3d.platform.GlStateManager;
import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.systems.RenderSystem;
import net.mcreator.target.entity.Mk42Entity; import net.mcreator.target.entity.Mk42Entity;
import net.mcreator.target.item.gun.GunItem; import net.mcreator.target.item.gun.GunItem;
import net.mcreator.target.network.TargetModVariables;
import net.mcreator.target.tools.RenderTool; import net.mcreator.target.tools.RenderTool;
import net.mcreator.target.tools.TraceTool; import net.mcreator.target.tools.TraceTool;
import net.minecraft.client.CameraType; import net.minecraft.client.CameraType;
@ -54,7 +55,8 @@ public class Mk42UIOverlay {
if (player == null) return false; if (player == null) return false;
return !player.isSpectator() return !player.isSpectator()
&& !(player.getMainHandItem().getItem() instanceof GunItem) && !(player.getMainHandItem().getItem() instanceof GunItem)
&& Minecraft.getInstance().options.getCameraType() == CameraType.FIRST_PERSON // && Minecraft.getInstance().options.getCameraType() == CameraType.FIRST_PERSON
&& (player.getVehicle() != null && player.getVehicle() instanceof Mk42Entity); && (player.getVehicle() != null && player.getVehicle() instanceof Mk42Entity)
&& (player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zoom;
} }
} }

6
src/main/resources/assets/target/animations/mk_42.animation.json
View file

@ -44,14 +44,14 @@
"0.0083": { "0.0083": {
"vector": [110, 110, 110] "vector": [110, 110, 110]
}, },
"0.025": { "0.05": {
"vector": [110, 110, 110] "vector": [110, 110, 110]
}, },
"0.05": { "0.075": {
"vector": [1, 1, 1], "vector": [1, 1, 1],
"easing": "easeOutQuad" "easing": "easeOutQuad"
}, },
"0.0667": { "0.0917": {
"vector": [0, 0, 0] "vector": [0, 0, 0]
}, },
"0.6667": { "0.6667": {

6
src/main/resources/assets/target/animations/mortar.animation.json
View file

@ -66,14 +66,14 @@
"1.0083": { "1.0083": {
"vector": [1200, 1200, 1200] "vector": [1200, 1200, 1200]
}, },
"1.025": { "1.0583": {
"vector": [1200, 1200, 1200] "vector": [1200, 1200, 1200]
}, },
"1.05": { "1.0833": {
"vector": [1, 1, 1], "vector": [1, 1, 1],
"easing": "easeOutQuad" "easing": "easeOutQuad"
}, },
"1.0667": { "1.1": {
"vector": [0, 0, 0] "vector": [0, 0, 0]
} }
} }