From 6ba751c1dd6765cc872872c1db626f66f0a4e6d8 Mon Sep 17 00:00:00 2001 From: Atsuihsio <842960157@qq.com> Date: Fri, 22 Nov 2024 14:52:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8C=89=E4=BD=8F=E7=9E=84?= =?UTF-8?q?=E5=87=86=E5=92=8C=E9=95=BF=E6=8C=89=E7=9E=84=E5=87=86=E7=9A=84?= =?UTF-8?q?=E6=8C=89=E9=94=AE=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- .../superbwarfare/client/ClickHandler.java | 101 ++++++++++++------ .../client/model/item/SvdItemModel.java | 3 +- .../renderer/item/AK12ItemRenderer.java | 11 +- .../renderer/item/AK47ItemRenderer.java | 11 +- .../renderer/item/Aa12ItemRenderer.java | 31 ------ .../renderer/item/BocekItemRenderer.java | 6 +- .../renderer/item/DevotionItemRenderer.java | 3 +- .../renderer/item/Hk416ItemRenderer.java | 11 +- .../client/renderer/item/M4ItemRenderer.java | 13 ++- .../renderer/item/M98bItemRenderer.java | 3 +- .../renderer/item/Mk14ItemRenderer.java | 5 +- .../item/MosinNagantItemRenderer.java | 3 +- .../client/renderer/item/Ntw20Renderer.java | 5 +- .../renderer/item/Qbz95ItemRenderer.java | 11 +- .../client/renderer/item/RpkItemRenderer.java | 3 +- .../renderer/item/SentinelItemRenderer.java | 3 +- .../client/renderer/item/SksItemRenderer.java | 3 +- .../client/renderer/item/SvdItemRenderer.java | 7 +- .../renderer/item/VectorItemRenderer.java | 5 +- .../client/screens/CannonHudOverlay.java | 4 +- .../client/screens/JavelinHudOverlay.java | 3 +- .../client/screens/M79UIOverlay.java | 4 +- .../entity/model/ProjectileEntityModel.java | 4 +- .../event/ClientEventHandler.java | 11 +- .../superbwarfare/init/ModKeyMappings.java | 4 + .../mixins/MouseHandlerMixin.java | 3 +- .../assets/superbwarfare/lang/en_us.json | 2 + .../assets/superbwarfare/lang/zh_cn.json | 2 + 29 files changed, 138 insertions(+), 139 deletions(-) diff --git a/gradle.properties b/gradle.properties index fbbeb5bb5..6172b767f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,4 +4,4 @@ org.gradle.daemon=false mc_version=1.20.1 jei_version=15.2.0.27 cloth_config_version=11.1.106 -mod_version=0.2.6 \ No newline at end of file +mod_version=0.2.7 \ No newline at end of file diff --git a/src/main/java/net/mcreator/superbwarfare/client/ClickHandler.java b/src/main/java/net/mcreator/superbwarfare/client/ClickHandler.java index 92cb24188..6c3cf3663 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/ClickHandler.java +++ b/src/main/java/net/mcreator/superbwarfare/client/ClickHandler.java @@ -37,6 +37,8 @@ import static net.mcreator.superbwarfare.event.ClientEventHandler.drawTime; @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.FORGE, value = Dist.CLIENT) public class ClickHandler { + + public static boolean switchZoom = false; private static boolean notInGame() { Minecraft mc = Minecraft.getInstance(); if (mc.player == null) return true; @@ -54,16 +56,22 @@ public class ClickHandler { Player player = Minecraft.getInstance().player; if (player == null) return; + if (player.hasEffect(ModMobEffects.SHOCK.get())) { + event.setCanceled(true); + return; + } + int button = event.getButton(); if (button == ModKeyMappings.FIRE.getKey().getValue()) { handleWeaponFireRelease(); } - if (button == GLFW.GLFW_MOUSE_BUTTON_RIGHT) { - if (player.hasEffect(ModMobEffects.SHOCK.get())) { - event.setCanceled(true); - } + if (button == ModKeyMappings.HOLD_ZOOM.getKey().getValue()) { + handleWeaponZoomRelease(); + return; + } - ModUtils.PACKET_HANDLER.sendToServer(new ZoomMessage(1)); + if (button == ModKeyMappings.SWITCH_ZOOM.getKey().getValue() && !switchZoom) { + handleWeaponZoomRelease(); } } @@ -78,36 +86,45 @@ public class ClickHandler { ItemStack stack = player.getMainHandItem(); + if (player.hasEffect(ModMobEffects.SHOCK.get())) { + event.setCanceled(true); + return; + } + int button = event.getButton(); if (player.getMainHandItem().is(ModTags.Items.GUN) || stack.is(ModItems.MONITOR.get()) - || player.hasEffect(ModMobEffects.SHOCK.get()) || (player.getVehicle() != null && player.getVehicle() instanceof ICannonEntity && player.getMainHandItem().getItem() instanceof CannonShellItem)) { if (button == GLFW.GLFW_MOUSE_BUTTON_LEFT) { event.setCanceled(true); } } + if (button == GLFW.GLFW_MOUSE_BUTTON_RIGHT) { + if (player.getMainHandItem().is(ModTags.Items.GUN) || (player.isPassenger() && player.getVehicle() instanceof ICannonEntity)) { + event.setCanceled(true); + } + } + + if (button == GLFW.GLFW_MOUSE_BUTTON_MIDDLE) { + if (player.hasEffect(ModMobEffects.SHOCK.get())) { + event.setCanceled(true); + } + } + if (button == ModKeyMappings.FIRE.getKey().getValue()) { handleWeaponFirePress(player, stack); } - if (button == GLFW.GLFW_MOUSE_BUTTON_RIGHT) { - if (player.hasEffect(ModMobEffects.SHOCK.get())) { - event.setCanceled(true); - return; - } - if (player.getMainHandItem().is(ModTags.Items.GUN) || (player.isPassenger() && player.getVehicle() instanceof ICannonEntity)) { - event.setCanceled(true); - ModUtils.PACKET_HANDLER.sendToServer(new ZoomMessage(0)); - } + if (button == ModKeyMappings.HOLD_ZOOM.getKey().getValue()) { + handleWeaponZoomPress(); + return; } - if (button == GLFW.GLFW_MOUSE_BUTTON_MIDDLE) { - if (player.hasEffect(ModMobEffects.SHOCK.get())) { - event.setCanceled(true); - } + if (button == ModKeyMappings.SWITCH_ZOOM.getKey().getValue()) { + handleWeaponZoomPress(); + switchZoom = !switchZoom; } } @@ -120,6 +137,11 @@ public class ClickHandler { ItemStack stack = player.getMainHandItem(); + if (player.hasEffect(ModMobEffects.SHOCK.get())) { + event.setCanceled(true); + return; + } + double scroll = event.getScrollDelta(); if (stack.is(ModTags.Items.GUN) && player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).zoom) { @@ -133,10 +155,6 @@ public class ClickHandler { event.setCanceled(true); } - if (player.hasEffect(ModMobEffects.SHOCK.get())) { - event.setCanceled(true); - } - Entity looking = TraceTool.findLookingEntity(player, 6); if (looking == null) return; if (looking instanceof MortarEntity && player.isShiftKeyDown()) { @@ -155,6 +173,11 @@ public class ClickHandler { ItemStack stack = player.getMainHandItem(); + if (player.hasEffect(ModMobEffects.SHOCK.get())) { + event.setCanceled(true); + return; + } + setKeyState(event); int key = event.getKey(); @@ -204,19 +227,25 @@ public class ClickHandler { if (key == ModKeyMappings.FIRE.getKey().getValue()) { handleWeaponFirePress(player, stack); } + + if (key == ModKeyMappings.HOLD_ZOOM.getKey().getValue()) { + handleWeaponZoomPress(); + } } if (event.getAction() == GLFW.GLFW_RELEASE) { - handleWeaponFireRelease(); + if (key == ModKeyMappings.FIRE.getKey().getValue()) { + handleWeaponFireRelease(); + } + + if (key == ModKeyMappings.HOLD_ZOOM.getKey().getValue()) { + handleWeaponZoomRelease(); + } } } public static void handleWeaponFirePress (Player player, ItemStack stack) { - if (player.hasEffect(ModMobEffects.SHOCK.get())) { - return; - } - if (stack.is(Items.SPYGLASS) && player.isScoping() && player.getOffhandItem().is(ModItems.FIRING_PARAMETERS.get())) { ModUtils.PACKET_HANDLER.sendToServer(new SetFiringParametersMessage(0)); } @@ -230,8 +259,8 @@ public class ClickHandler { return; } - if (player.getMainHandItem().is(ModTags.Items.GUN)) { - if (stack.is(ModTags.Items.GUN) && (!(stack.getOrCreateTag().getBoolean("is_normal_reloading") || stack.getOrCreateTag().getBoolean("is_empty_reloading")) + if (stack.is(ModTags.Items.GUN)) { + if ((!(stack.getOrCreateTag().getBoolean("is_normal_reloading") || stack.getOrCreateTag().getBoolean("is_empty_reloading")) && !stack.getOrCreateTag().getBoolean("reloading") && !stack.getOrCreateTag().getBoolean("charging") && !stack.getOrCreateTag().getBoolean("need_bolt_action")) @@ -241,7 +270,7 @@ public class ClickHandler { player.playSound(ModSounds.TRIGGER_CLICK.get(), 1, 1); } - if (stack.is(ModTags.Items.GUN) && !stack.is(ModTags.Items.CANNOT_RELOAD) && stack.getOrCreateTag().getInt("ammo") <= 0) { + if (!stack.is(ModTags.Items.CANNOT_RELOAD) && stack.getOrCreateTag().getInt("ammo") <= 0) { if (ReloadConfig.LEFT_CLICK_RELOAD.get()) { ModUtils.PACKET_HANDLER.sendToServer(new ReloadMessage(0)); } @@ -261,6 +290,16 @@ public class ClickHandler { ClientEventHandler.customRpm = 0; } + public static void handleWeaponZoomPress () { + ModUtils.PACKET_HANDLER.sendToServer(new ZoomMessage(0)); + ClientEventHandler.zoom = true; + } + + public static void handleWeaponZoomRelease () { + ModUtils.PACKET_HANDLER.sendToServer(new ZoomMessage(1)); + ClientEventHandler.zoom = false; + } + private static void editModelShake() { ClientEventHandler.movePosY = -0.8; ClientEventHandler.fireRotTimer = 0.4; diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/SvdItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/SvdItemModel.java index 6b0097e99..8894a21d7 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/SvdItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/SvdItemModel.java @@ -10,7 +10,6 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; -import org.lwjgl.glfw.GLFW; import software.bernie.geckolib.core.animatable.model.CoreGeoBone; import software.bernie.geckolib.core.animation.AnimationState; import software.bernie.geckolib.model.GeoModel; @@ -83,7 +82,7 @@ public class SvdItemModel extends GeoModel { CoreGeoBone shen = getAnimationProcessor().getBone("shen"); - if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) { + if (ClientEventHandler.zoom) { flare.setPosY(-2.5f); } diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/AK12ItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/AK12ItemRenderer.java index 828794d09..c0a9e2fb1 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/AK12ItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/AK12ItemRenderer.java @@ -20,7 +20,6 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; -import org.lwjgl.glfw.GLFW; import software.bernie.geckolib.cache.object.BakedGeoModel; import software.bernie.geckolib.cache.object.GeoBone; import software.bernie.geckolib.renderer.GeoItemRenderer; @@ -87,30 +86,30 @@ public class AK12ItemRenderer extends GeoItemRenderer { if (name.equals("Cross1")) { bone.setHidden(itemStack.getOrCreateTag().getBoolean("HoloHidden") - || GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) != GLFW.GLFW_PRESS + || !ClientEventHandler.zoom || GunsTool.getAttachmentType(itemStack, GunsTool.AttachmentType.SCOPE) != 1); } if (name.equals("Cross2")) { bone.setHidden(itemStack.getOrCreateTag().getBoolean("HoloHidden") - || GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) != GLFW.GLFW_PRESS + || !ClientEventHandler.zoom || GunsTool.getAttachmentType(itemStack, GunsTool.AttachmentType.SCOPE) != 2); } if (name.equals("Cross3")) { bone.setHidden(itemStack.getOrCreateTag().getBoolean("HoloHidden") - || GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) != GLFW.GLFW_PRESS + || !ClientEventHandler.zoom || GunsTool.getAttachmentType(itemStack, GunsTool.AttachmentType.SCOPE) != 3); } if (GunsTool.getAttachmentType(itemStack, GunsTool.AttachmentType.SCOPE) == 2 && (name.equals("hidden2"))) { - bone.setHidden(!itemStack.getOrCreateTag().getBoolean("HoloHidden") && GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS); + bone.setHidden(!itemStack.getOrCreateTag().getBoolean("HoloHidden") && ClientEventHandler.zoom); } if (GunsTool.getAttachmentType(itemStack, GunsTool.AttachmentType.SCOPE) == 3 && (name.equals("jing") || name.equals("Barrel") || name.equals("humu") || name.equals("qiangguan") || name.equals("houzhunxing"))) { - bone.setHidden(!itemStack.getOrCreateTag().getBoolean("HoloHidden") && GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS); + bone.setHidden(!itemStack.getOrCreateTag().getBoolean("HoloHidden") && ClientEventHandler.zoom); } if (name.equals("flare")) { diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/AK47ItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/AK47ItemRenderer.java index ebb688091..c6cd5287d 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/AK47ItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/AK47ItemRenderer.java @@ -20,7 +20,6 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; -import org.lwjgl.glfw.GLFW; import software.bernie.geckolib.cache.object.BakedGeoModel; import software.bernie.geckolib.cache.object.GeoBone; import software.bernie.geckolib.renderer.GeoItemRenderer; @@ -87,19 +86,19 @@ public class AK47ItemRenderer extends GeoItemRenderer { if (name.equals("Cross1")) { bone.setHidden(itemStack.getOrCreateTag().getBoolean("HoloHidden") - || GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) != GLFW.GLFW_PRESS + || !ClientEventHandler.zoom || GunsTool.getAttachmentType(itemStack, GunsTool.AttachmentType.SCOPE) != 1); } if (name.equals("Cross2")) { bone.setHidden(itemStack.getOrCreateTag().getBoolean("HoloHidden") - || GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) != GLFW.GLFW_PRESS + || !ClientEventHandler.zoom || GunsTool.getAttachmentType(itemStack, GunsTool.AttachmentType.SCOPE) != 2); } if (name.equals("Cross3")) { bone.setHidden(itemStack.getOrCreateTag().getBoolean("HoloHidden") - || GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) != GLFW.GLFW_PRESS + || !ClientEventHandler.zoom || GunsTool.getAttachmentType(itemStack, GunsTool.AttachmentType.SCOPE) != 3); } @@ -113,12 +112,12 @@ public class AK47ItemRenderer extends GeoItemRenderer { if (GunsTool.getAttachmentType(itemStack, GunsTool.AttachmentType.SCOPE) == 2 && (name.equals("Hidden") || name.equals("Barrel") || name.equals("humu") || name.equals("qiangguan") || name.equals("houzhunxing"))) { - bone.setHidden(!itemStack.getOrCreateTag().getBoolean("HoloHidden") && GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS); + bone.setHidden(!itemStack.getOrCreateTag().getBoolean("HoloHidden") && ClientEventHandler.zoom); } if (GunsTool.getAttachmentType(itemStack, GunsTool.AttachmentType.SCOPE) == 3 && (name.equals("jing") || name.equals("Barrel") || name.equals("humu") || name.equals("qiangguan") || name.equals("houzhunxing"))) { - bone.setHidden(!itemStack.getOrCreateTag().getBoolean("HoloHidden") && GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS); + bone.setHidden(!itemStack.getOrCreateTag().getBoolean("HoloHidden") && ClientEventHandler.zoom); } if (name.equals("flare")) { diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Aa12ItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Aa12ItemRenderer.java index 090044f45..ed5f50236 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Aa12ItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Aa12ItemRenderer.java @@ -84,38 +84,7 @@ public class Aa12ItemRenderer extends GeoItemRenderer { if (player != null) { ItemStack itemStack = player.getMainHandItem(); -// if (name.equals("Cross1")) { -// bone.setHidden(itemStack.getOrCreateTag().getBoolean("HoloHidden") -// || GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) != GLFW.GLFW_PRESS -// || GunsTool.getAttachmentType(itemStack, GunsTool.AttachmentType.SCOPE) != 1); -// } -// -// if (name.equals("Cross2")) { -// bone.setHidden(itemStack.getOrCreateTag().getBoolean("HoloHidden") -// || GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) != GLFW.GLFW_PRESS -// || GunsTool.getAttachmentType(itemStack, GunsTool.AttachmentType.SCOPE) != 2); -// } -// -// if (name.equals("Cross3")) { -// bone.setHidden(itemStack.getOrCreateTag().getBoolean("HoloHidden") -// || GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) != GLFW.GLFW_PRESS -// || GunsTool.getAttachmentType(itemStack, GunsTool.AttachmentType.SCOPE) != 3); -// } -// -// if (GunsTool.getAttachmentType(itemStack, GunsTool.AttachmentType.SCOPE) == 2 -// && (name.equals("hidden"))) { -// bone.setHidden(!itemStack.getOrCreateTag().getBoolean("HoloHidden") && GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS); -// } -// -// if (GunsTool.getAttachmentType(itemStack, GunsTool.AttachmentType.SCOPE) == 3 -// && (name.equals("jing") || name.equals("Barrel") || name.equals("humu") || name.equals("qiangguan") || name.equals("houzhunxing"))) { -// bone.setHidden(!itemStack.getOrCreateTag().getBoolean("HoloHidden") && GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS); -// } - if (name.equals("flare")) { -// if (GunsTool.getAttachmentType(itemStack, GunsTool.AttachmentType.BARREL) == 1) { -// bone.setPosZ(2.25f); -// } if (ClientEventHandler.firePosTimer == 0 || ClientEventHandler.firePosTimer > 0.5 || GunsTool.getAttachmentType(itemStack, GunsTool.AttachmentType.BARREL) == 2) { bone.setHidden(true); } else { diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/BocekItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/BocekItemRenderer.java index bff3989aa..7dec0f7f1 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/BocekItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/BocekItemRenderer.java @@ -2,10 +2,11 @@ package net.mcreator.superbwarfare.client.renderer.item; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; +import net.mcreator.superbwarfare.client.AnimationHelper; import net.mcreator.superbwarfare.client.layer.BocekLayer; import net.mcreator.superbwarfare.client.model.item.BocekItemModel; +import net.mcreator.superbwarfare.event.ClientEventHandler; import net.mcreator.superbwarfare.item.gun.special.BocekItem; -import net.mcreator.superbwarfare.client.AnimationHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.model.PlayerModel; import net.minecraft.client.player.AbstractClientPlayer; @@ -17,7 +18,6 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; -import org.lwjgl.glfw.GLFW; import software.bernie.geckolib.cache.object.BakedGeoModel; import software.bernie.geckolib.cache.object.GeoBone; import software.bernie.geckolib.renderer.GeoItemRenderer; @@ -86,7 +86,7 @@ public class BocekItemRenderer extends GeoItemRenderer { if (name.equals("holo")) { if (player_ != null) { - bone.setHidden(itemStack.getOrCreateTag().getBoolean("HoloHidden") || GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) != GLFW.GLFW_PRESS); + bone.setHidden(itemStack.getOrCreateTag().getBoolean("HoloHidden") || !ClientEventHandler.zoom); } } diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/DevotionItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/DevotionItemRenderer.java index 7c1288bd7..0513b4208 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/DevotionItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/DevotionItemRenderer.java @@ -18,7 +18,6 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; -import org.lwjgl.glfw.GLFW; import software.bernie.geckolib.cache.object.BakedGeoModel; import software.bernie.geckolib.cache.object.GeoBone; import software.bernie.geckolib.renderer.GeoItemRenderer; @@ -94,7 +93,7 @@ public class DevotionItemRenderer extends GeoItemRenderer { if (name.equals("holo")) { ItemStack itemStack = player.getMainHandItem(); - bone.setHidden(itemStack.getOrCreateTag().getBoolean("HoloHidden") || GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) != GLFW.GLFW_PRESS); + bone.setHidden(itemStack.getOrCreateTag().getBoolean("HoloHidden") || !ClientEventHandler.zoom); } } diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Hk416ItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Hk416ItemRenderer.java index 5cd644766..06ddda0ea 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Hk416ItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Hk416ItemRenderer.java @@ -20,7 +20,6 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; -import org.lwjgl.glfw.GLFW; import software.bernie.geckolib.cache.object.BakedGeoModel; import software.bernie.geckolib.cache.object.GeoBone; import software.bernie.geckolib.renderer.GeoItemRenderer; @@ -87,30 +86,30 @@ public class Hk416ItemRenderer extends GeoItemRenderer { if (name.equals("Cross1")) { bone.setHidden(itemStack.getOrCreateTag().getBoolean("HoloHidden") - || GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) != GLFW.GLFW_PRESS + || !ClientEventHandler.zoom || GunsTool.getAttachmentType(itemStack, GunsTool.AttachmentType.SCOPE) != 1); } if (name.equals("Cross2")) { bone.setHidden(itemStack.getOrCreateTag().getBoolean("HoloHidden") - || GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) != GLFW.GLFW_PRESS + || !ClientEventHandler.zoom || GunsTool.getAttachmentType(itemStack, GunsTool.AttachmentType.SCOPE) != 2); } if (name.equals("Cross3")) { bone.setHidden(itemStack.getOrCreateTag().getBoolean("HoloHidden") - || GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) != GLFW.GLFW_PRESS + || !ClientEventHandler.zoom || GunsTool.getAttachmentType(itemStack, GunsTool.AttachmentType.SCOPE) != 3); } if (GunsTool.getAttachmentType(itemStack, GunsTool.AttachmentType.SCOPE) == 2 && (name.equals("hidden"))) { - bone.setHidden(!itemStack.getOrCreateTag().getBoolean("HoloHidden") && GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS); + bone.setHidden(!itemStack.getOrCreateTag().getBoolean("HoloHidden") && ClientEventHandler.zoom); } if (GunsTool.getAttachmentType(itemStack, GunsTool.AttachmentType.SCOPE) == 3 && (name.equals("jing") || name.equals("Barrel") || name.equals("yugu") || name.equals("qiangguan"))) { - bone.setHidden(!itemStack.getOrCreateTag().getBoolean("HoloHidden") && GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS); + bone.setHidden(!itemStack.getOrCreateTag().getBoolean("HoloHidden") && ClientEventHandler.zoom); } if (name.equals("flare")) { diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/M4ItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/M4ItemRenderer.java index 96e54fe44..12fdc9dde 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/M4ItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/M4ItemRenderer.java @@ -20,7 +20,6 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; -import org.lwjgl.glfw.GLFW; import software.bernie.geckolib.cache.object.BakedGeoModel; import software.bernie.geckolib.cache.object.GeoBone; import software.bernie.geckolib.renderer.GeoItemRenderer; @@ -87,37 +86,37 @@ public class M4ItemRenderer extends GeoItemRenderer { if (name.equals("Cross1")) { bone.setHidden(itemStack.getOrCreateTag().getBoolean("HoloHidden") - || GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) != GLFW.GLFW_PRESS + || !ClientEventHandler.zoom || GunsTool.getAttachmentType(itemStack, GunsTool.AttachmentType.SCOPE) != 1); } if (name.equals("Cross2")) { bone.setHidden(itemStack.getOrCreateTag().getBoolean("HoloHidden") - || GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) != GLFW.GLFW_PRESS + || !ClientEventHandler.zoom || GunsTool.getAttachmentType(itemStack, GunsTool.AttachmentType.SCOPE) != 2 || itemStack.getOrCreateTag().getBoolean("ScopeAlt")); } if (name.equals("CrossAlt")) { bone.setHidden(itemStack.getOrCreateTag().getBoolean("HoloHidden") - || GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) != GLFW.GLFW_PRESS + || !ClientEventHandler.zoom || GunsTool.getAttachmentType(itemStack, GunsTool.AttachmentType.SCOPE) != 2 || !(itemStack.getOrCreateTag().getBoolean("ScopeAlt"))); } if (name.equals("Cross3")) { bone.setHidden(itemStack.getOrCreateTag().getBoolean("HoloHidden") - || GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) != GLFW.GLFW_PRESS + || !ClientEventHandler.zoom || GunsTool.getAttachmentType(itemStack, GunsTool.AttachmentType.SCOPE) != 3); } if (GunsTool.getAttachmentType(itemStack, GunsTool.AttachmentType.SCOPE) == 2 && !itemStack.getOrCreateTag().getBoolean("ScopeAlt") && (name.equals("hidden"))) { - bone.setHidden(!itemStack.getOrCreateTag().getBoolean("HoloHidden") && GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS); + bone.setHidden(!itemStack.getOrCreateTag().getBoolean("HoloHidden") && ClientEventHandler.zoom); } if (GunsTool.getAttachmentType(itemStack, GunsTool.AttachmentType.SCOPE) == 3 && (name.equals("hidden2") || name.equals("yugu") || name.equals("qiangguan") || name.equals("Barrel"))) { - bone.setHidden(!itemStack.getOrCreateTag().getBoolean("HoloHidden") && GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS); + bone.setHidden(!itemStack.getOrCreateTag().getBoolean("HoloHidden") && ClientEventHandler.zoom); } if (name.equals("flare")) { diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/M98bItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/M98bItemRenderer.java index 21abbea59..66947a923 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/M98bItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/M98bItemRenderer.java @@ -18,7 +18,6 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; -import org.lwjgl.glfw.GLFW; import software.bernie.geckolib.cache.object.BakedGeoModel; import software.bernie.geckolib.cache.object.GeoBone; import software.bernie.geckolib.renderer.GeoItemRenderer; @@ -95,7 +94,7 @@ public class M98bItemRenderer extends GeoItemRenderer { } if (name.equals("scope2")) { - bone.setHidden(itemStack.getOrCreateTag().getBoolean("HoloHidden") || GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) != GLFW.GLFW_PRESS); + bone.setHidden(itemStack.getOrCreateTag().getBoolean("HoloHidden") || !ClientEventHandler.zoom); } if (name.equals("qiang")) { diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Mk14ItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Mk14ItemRenderer.java index c3d399be8..f6243f735 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Mk14ItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Mk14ItemRenderer.java @@ -18,7 +18,6 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; -import org.lwjgl.glfw.GLFW; import software.bernie.geckolib.cache.object.BakedGeoModel; import software.bernie.geckolib.cache.object.GeoBone; import software.bernie.geckolib.renderer.GeoItemRenderer; @@ -85,11 +84,11 @@ public class Mk14ItemRenderer extends GeoItemRenderer { ItemStack itemStack = player.getMainHandItem(); if (name.equals("rex")) { - bone.setHidden(itemStack.getOrCreateTag().getBoolean("HoloHidden") || GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) != GLFW.GLFW_PRESS); + bone.setHidden(itemStack.getOrCreateTag().getBoolean("HoloHidden") || !ClientEventHandler.zoom); } if (name.equals("jing") || name.equals("qiangguan")) { - bone.setHidden(!itemStack.getOrCreateTag().getBoolean("HoloHidden") && GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS); + bone.setHidden(!itemStack.getOrCreateTag().getBoolean("HoloHidden") && ClientEventHandler.zoom); } if (name.equals("flare")) { diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/MosinNagantItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/MosinNagantItemRenderer.java index 079338c84..3109c239c 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/MosinNagantItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/MosinNagantItemRenderer.java @@ -18,7 +18,6 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; -import org.lwjgl.glfw.GLFW; import software.bernie.geckolib.cache.object.BakedGeoModel; import software.bernie.geckolib.cache.object.GeoBone; import software.bernie.geckolib.renderer.GeoItemRenderer; @@ -84,7 +83,7 @@ public class MosinNagantItemRenderer extends GeoItemRenderer { ItemStack itemStack = player.getMainHandItem(); if (name.equals("rex")) { - bone.setHidden(itemStack.getOrCreateTag().getBoolean("HoloHidden") || GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) != GLFW.GLFW_PRESS); + bone.setHidden(itemStack.getOrCreateTag().getBoolean("HoloHidden") || !ClientEventHandler.zoom); } if (name.equals("jia") || name.equals("b1") || name.equals("b2")) { diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Ntw20Renderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Ntw20Renderer.java index fe2afbc55..bd77ddb94 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Ntw20Renderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Ntw20Renderer.java @@ -18,7 +18,6 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; -import org.lwjgl.glfw.GLFW; import software.bernie.geckolib.cache.object.BakedGeoModel; import software.bernie.geckolib.cache.object.GeoBone; import software.bernie.geckolib.renderer.GeoItemRenderer; @@ -85,11 +84,11 @@ public class Ntw20Renderer extends GeoItemRenderer { ItemStack itemStack = player.getMainHandItem(); if (name.equals("rex")) { - bone.setHidden(itemStack.getOrCreateTag().getBoolean("HoloHidden") || GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) != GLFW.GLFW_PRESS); + bone.setHidden(itemStack.getOrCreateTag().getBoolean("HoloHidden") || !ClientEventHandler.zoom); } if (name.equals("jing") || name.equals("action") || name.equals("body") || name.equals("base")) { - bone.setHidden(!itemStack.getOrCreateTag().getBoolean("HoloHidden") && GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS); + bone.setHidden(!itemStack.getOrCreateTag().getBoolean("HoloHidden") && ClientEventHandler.zoom); } if (name.equals("flare")) { diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Qbz95ItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Qbz95ItemRenderer.java index c71709d01..353980f4c 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Qbz95ItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Qbz95ItemRenderer.java @@ -20,7 +20,6 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; -import org.lwjgl.glfw.GLFW; import software.bernie.geckolib.cache.object.BakedGeoModel; import software.bernie.geckolib.cache.object.GeoBone; import software.bernie.geckolib.renderer.GeoItemRenderer; @@ -88,7 +87,7 @@ public class Qbz95ItemRenderer extends GeoItemRenderer { if (name.equals("Cross1")) { bone.setHidden(itemStack.getOrCreateTag().getBoolean("HoloHidden") - || GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) != GLFW.GLFW_PRESS + || !ClientEventHandler.zoom || GunsTool.getAttachmentType(itemStack, GunsTool.AttachmentType.SCOPE) != 1); } @@ -106,24 +105,24 @@ public class Qbz95ItemRenderer extends GeoItemRenderer { if (name.equals("Cross2")) { bone.setHidden(itemStack.getOrCreateTag().getBoolean("HoloHidden") - || GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) != GLFW.GLFW_PRESS + || !ClientEventHandler.zoom || GunsTool.getAttachmentType(itemStack, GunsTool.AttachmentType.SCOPE) != 2); } if (name.equals("Cross3")) { bone.setHidden(itemStack.getOrCreateTag().getBoolean("HoloHidden") - || GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) != GLFW.GLFW_PRESS + || !ClientEventHandler.zoom || GunsTool.getAttachmentType(itemStack, GunsTool.AttachmentType.SCOPE) != 3); } if (GunsTool.getAttachmentType(itemStack, GunsTool.AttachmentType.SCOPE) == 2 && (name.equals("hidden"))) { - bone.setHidden(!itemStack.getOrCreateTag().getBoolean("HoloHidden") && GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS); + bone.setHidden(!itemStack.getOrCreateTag().getBoolean("HoloHidden") && ClientEventHandler.zoom); } if (GunsTool.getAttachmentType(itemStack, GunsTool.AttachmentType.SCOPE) == 3 && (name.equals("hidden2") || name.equals("jimiao2"))) { - bone.setHidden(!itemStack.getOrCreateTag().getBoolean("HoloHidden") && GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS); + bone.setHidden(!itemStack.getOrCreateTag().getBoolean("HoloHidden") && ClientEventHandler.zoom); } if (name.equals("flare")) { diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/RpkItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/RpkItemRenderer.java index af30ad1ed..81be32022 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/RpkItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/RpkItemRenderer.java @@ -18,7 +18,6 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; -import org.lwjgl.glfw.GLFW; import software.bernie.geckolib.cache.object.BakedGeoModel; import software.bernie.geckolib.cache.object.GeoBone; import software.bernie.geckolib.renderer.GeoItemRenderer; @@ -84,7 +83,7 @@ public class RpkItemRenderer extends GeoItemRenderer { ItemStack itemStack = player.getMainHandItem(); if (name.equals("holo")) { - bone.setHidden(itemStack.getOrCreateTag().getBoolean("HoloHidden") || GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) != GLFW.GLFW_PRESS); + bone.setHidden(itemStack.getOrCreateTag().getBoolean("HoloHidden") || !ClientEventHandler.zoom); } if (name.equals("flare")) { diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/SentinelItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/SentinelItemRenderer.java index a197e1bcb..bd11d18c3 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/SentinelItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/SentinelItemRenderer.java @@ -19,7 +19,6 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import net.minecraftforge.common.capabilities.ForgeCapabilities; -import org.lwjgl.glfw.GLFW; import software.bernie.geckolib.cache.object.BakedGeoModel; import software.bernie.geckolib.cache.object.GeoBone; import software.bernie.geckolib.renderer.GeoItemRenderer; @@ -98,7 +97,7 @@ public class SentinelItemRenderer extends GeoItemRenderer { } if (name.equals("holo")) { - bone.setHidden(itemStack.getOrCreateTag().getBoolean("HoloHidden") || GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) != GLFW.GLFW_PRESS); + bone.setHidden(itemStack.getOrCreateTag().getBoolean("HoloHidden") || !ClientEventHandler.zoom); } AtomicBoolean flag = new AtomicBoolean(false); diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/SksItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/SksItemRenderer.java index 89c721bbf..a8cd90dae 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/SksItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/SksItemRenderer.java @@ -18,7 +18,6 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; -import org.lwjgl.glfw.GLFW; import software.bernie.geckolib.cache.object.BakedGeoModel; import software.bernie.geckolib.cache.object.GeoBone; import software.bernie.geckolib.renderer.GeoItemRenderer; @@ -84,7 +83,7 @@ public class SksItemRenderer extends GeoItemRenderer { ItemStack itemStack = player.getMainHandItem(); if (name.equals("holo")) { - bone.setHidden(itemStack.getOrCreateTag().getBoolean("HoloHidden") || GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) != GLFW.GLFW_PRESS); + bone.setHidden(itemStack.getOrCreateTag().getBoolean("HoloHidden") || !ClientEventHandler.zoom); } if (name.equals("flare")) { diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/SvdItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/SvdItemRenderer.java index 1d83c53e3..a8020b75d 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/SvdItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/SvdItemRenderer.java @@ -18,7 +18,6 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; -import org.lwjgl.glfw.GLFW; import software.bernie.geckolib.cache.object.BakedGeoModel; import software.bernie.geckolib.cache.object.GeoBone; import software.bernie.geckolib.renderer.GeoItemRenderer; @@ -85,7 +84,7 @@ public class SvdItemRenderer extends GeoItemRenderer { ItemStack itemStack = player.getMainHandItem(); if (name.equals("holo")) { - bone.setHidden(itemStack.getOrCreateTag().getBoolean("HoloHidden") || GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) != GLFW.GLFW_PRESS); + bone.setHidden(itemStack.getOrCreateTag().getBoolean("HoloHidden") || !ClientEventHandler.zoom); } if (name.equals("glass")) { @@ -93,11 +92,11 @@ public class SvdItemRenderer extends GeoItemRenderer { } if (name.equals("handguard")) { - bone.setHidden(!itemStack.getOrCreateTag().getBoolean("HoloHidden") && GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS); + bone.setHidden(!itemStack.getOrCreateTag().getBoolean("HoloHidden") && ClientEventHandler.zoom); } if (name.equals("holo")) { - bone.setHidden(itemStack.getOrCreateTag().getBoolean("HoloHidden") || GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) != GLFW.GLFW_PRESS); + bone.setHidden(itemStack.getOrCreateTag().getBoolean("HoloHidden") || !ClientEventHandler.zoom); } if (name.equals("flare")) { diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/VectorItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/VectorItemRenderer.java index d686bbf2c..c6985c839 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/VectorItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/VectorItemRenderer.java @@ -20,7 +20,6 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; -import org.lwjgl.glfw.GLFW; import software.bernie.geckolib.cache.object.BakedGeoModel; import software.bernie.geckolib.cache.object.GeoBone; import software.bernie.geckolib.renderer.GeoItemRenderer; @@ -87,13 +86,13 @@ public class VectorItemRenderer extends GeoItemRenderer { if (name.equals("Cross1")) { bone.setHidden(itemStack.getOrCreateTag().getBoolean("HoloHidden") - || GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) != GLFW.GLFW_PRESS + || !ClientEventHandler.zoom || GunsTool.getAttachmentType(itemStack, GunsTool.AttachmentType.SCOPE) != 1); } if (name.equals("Cross2")) { bone.setHidden(itemStack.getOrCreateTag().getBoolean("HoloHidden") - || GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) != GLFW.GLFW_PRESS + || !ClientEventHandler.zoom || GunsTool.getAttachmentType(itemStack, GunsTool.AttachmentType.SCOPE) != 2); } 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 cb995d859..20360f23b 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/screens/CannonHudOverlay.java +++ b/src/main/java/net/mcreator/superbwarfare/client/screens/CannonHudOverlay.java @@ -6,6 +6,7 @@ import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.entity.ICannonEntity; import net.mcreator.superbwarfare.entity.Mk42Entity; import net.mcreator.superbwarfare.entity.Mle1934Entity; +import net.mcreator.superbwarfare.event.ClientEventHandler; import net.mcreator.superbwarfare.item.gun.GunItem; import net.mcreator.superbwarfare.tools.TraceTool; import net.minecraft.client.Minecraft; @@ -24,7 +25,6 @@ import net.minecraftforge.client.event.RenderGuiEvent; import net.minecraftforge.eventbus.api.EventPriority; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -import org.lwjgl.glfw.GLFW; import java.text.DecimalFormat; @@ -72,7 +72,7 @@ public class CannonHudOverlay { int j = Mth.floor(f * f1); int k = (w - i) / 2; int l = (h - j) / 2; - if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) { + if (ClientEventHandler.zoom) { Entity lookingEntity = TraceTool.findLookingEntity(player, 512); boolean lookAtEntity = false; double block_range = player.position().distanceTo((Vec3.atLowerCornerOf(player.level().clip( diff --git a/src/main/java/net/mcreator/superbwarfare/client/screens/JavelinHudOverlay.java b/src/main/java/net/mcreator/superbwarfare/client/screens/JavelinHudOverlay.java index fe7d68593..a9771dc00 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/screens/JavelinHudOverlay.java +++ b/src/main/java/net/mcreator/superbwarfare/client/screens/JavelinHudOverlay.java @@ -17,7 +17,6 @@ import net.minecraftforge.client.event.RenderGuiEvent; import net.minecraftforge.eventbus.api.EventPriority; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -import org.lwjgl.glfw.GLFW; import static net.mcreator.superbwarfare.client.RenderHelper.preciseBlit; @@ -36,7 +35,7 @@ public class JavelinHudOverlay { 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() && GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) { + if ((stack.getItem() == ModItems.JAVELIN.get() && !stack.getOrCreateTag().getBoolean("HoloHidden")) && Minecraft.getInstance().options.getCameraType().isFirstPerson() && ClientEventHandler.zoom) { RenderSystem.disableDepthTest(); RenderSystem.depthMask(false); RenderSystem.enableBlend(); diff --git a/src/main/java/net/mcreator/superbwarfare/client/screens/M79UIOverlay.java b/src/main/java/net/mcreator/superbwarfare/client/screens/M79UIOverlay.java index 76c75a9fc..ac0626870 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/screens/M79UIOverlay.java +++ b/src/main/java/net/mcreator/superbwarfare/client/screens/M79UIOverlay.java @@ -4,6 +4,7 @@ import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.entity.ICannonEntity; +import net.mcreator.superbwarfare.event.ClientEventHandler; import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.network.ModVariables; import net.minecraft.client.CameraType; @@ -15,7 +16,6 @@ import net.minecraftforge.client.event.RenderGuiEvent; import net.minecraftforge.eventbus.api.EventPriority; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -import org.lwjgl.glfw.GLFW; @Mod.EventBusSubscriber(value = Dist.CLIENT) public class M79UIOverlay { @@ -50,6 +50,6 @@ public class M79UIOverlay { return !player.isSpectator() && player.getMainHandItem().getItem() == ModItems.M_79.get() && (Minecraft.getInstance().options.getCameraType() == CameraType.FIRST_PERSON || (player.isPassenger() && player.getVehicle() instanceof ICannonEntity)) - && GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) != GLFW.GLFW_PRESS; + && !ClientEventHandler.zoom; } } diff --git a/src/main/java/net/mcreator/superbwarfare/entity/model/ProjectileEntityModel.java b/src/main/java/net/mcreator/superbwarfare/entity/model/ProjectileEntityModel.java index 33ac71c3c..67dc0bc11 100644 --- a/src/main/java/net/mcreator/superbwarfare/entity/model/ProjectileEntityModel.java +++ b/src/main/java/net/mcreator/superbwarfare/entity/model/ProjectileEntityModel.java @@ -2,11 +2,11 @@ package net.mcreator.superbwarfare.entity.model; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.entity.projectile.ProjectileEntity; +import net.mcreator.superbwarfare.event.ClientEventHandler; import net.mcreator.superbwarfare.init.ModItems; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Player; -import org.lwjgl.glfw.GLFW; import software.bernie.geckolib.core.animatable.model.CoreGeoBone; import software.bernie.geckolib.core.animation.AnimationState; import software.bernie.geckolib.model.GeoModel; @@ -24,7 +24,7 @@ public class ProjectileEntityModel extends GeoModel { return new ResourceLocation(ModUtils.MODID, "geo/projectile_entity2.geo.json"); } - if ((GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS && !player.getMainHandItem().is(ModItems.MINIGUN.get())) + if ((ClientEventHandler.zoom && !player.getMainHandItem().is(ModItems.MINIGUN.get())) || player.getMainHandItem().is(ModItems.GLOCK_17.get()) || player.getMainHandItem().is(ModItems.GLOCK_18.get()) || player.getMainHandItem().is(ModItems.BOCEK.get())) { diff --git a/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java b/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java index 02f97ef06..04e53dff7 100644 --- a/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java +++ b/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java @@ -115,6 +115,8 @@ public class ClientEventHandler { public static MillisTimer clientTimer = new MillisTimer(); public static boolean holdFire = false; + + public static boolean zoom = false; public static int burstFireSize = 0; public static int customRpm = 0; @@ -186,7 +188,7 @@ public class ClientEventHandler { } ItemStack stack = player.getMainHandItem(); if (stack.getItem() == ModItems.MINIGUN.get()) { - if (holdFire || GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) { + if (holdFire || zoom) { miniGunRot = Math.min(miniGunRot + 5, 21); float rpm = 1; @@ -250,7 +252,7 @@ public class ClientEventHandler { double weight = stack.getOrCreateTag().getDouble("weight") + stack.getOrCreateTag().getDouble("CustomWeight"); double speed = 1 - (0.04 * weight); - if (player.getPersistentData().getDouble("noRun") == 0 && player.isSprinting() && GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) != GLFW.GLFW_PRESS) { + if (player.getPersistentData().getDouble("noRun") == 0 && player.isSprinting() && !zoom) { cantFireTime = Mth.clamp(cantFireTime + 3 * times, 0, 24); } else { cantFireTime = Mth.clamp(cantFireTime - 6 * speed * times, 0, 40); @@ -706,8 +708,7 @@ public class ClientEventHandler { double weight = stack.getOrCreateTag().getDouble("weight") + stack.getOrCreateTag().getDouble("CustomWeight"); double speed = 1.5 - (0.07 * weight); - if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS - && !notInGame() + if (zoom && !notInGame() && drawTime < 0.01 && !player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables()).edit) { if (Minecraft.getInstance().player != null) { @@ -1030,7 +1031,7 @@ public class ClientEventHandler { fov = event.getFOV(); return; } - if (player.isPassenger() && player.getVehicle() instanceof ICannonEntity && GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS && !stack.is(ModTags.Items.GUN)) { + if (player.isPassenger() && player.getVehicle() instanceof ICannonEntity && zoom && !stack.is(ModTags.Items.GUN)) { event.setFOV(event.getFOV() / 5); } } diff --git a/src/main/java/net/mcreator/superbwarfare/init/ModKeyMappings.java b/src/main/java/net/mcreator/superbwarfare/init/ModKeyMappings.java index 61e95c589..ee63f40b6 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/ModKeyMappings.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModKeyMappings.java @@ -80,6 +80,8 @@ public class ModKeyMappings { KeyModifier.SHIFT, InputConstants.Type.KEYSYM, GLFW.GLFW_KEY_DOWN, "key.categories.superbwarfare"); public static final KeyMapping FIRE = new KeyMapping("key.superbwarfare.fire", InputConstants.Type.MOUSE, GLFW.GLFW_MOUSE_BUTTON_LEFT, "key.categories.superbwarfare"); + public static final KeyMapping HOLD_ZOOM = new KeyMapping("key.superbwarfare.hold_zoom", InputConstants.Type.MOUSE, GLFW.GLFW_MOUSE_BUTTON_RIGHT, "key.categories.superbwarfare"); + public static final KeyMapping SWITCH_ZOOM = new KeyMapping("key.superbwarfare.switch_zoom", GLFW.GLFW_KEY_UNKNOWN, "key.categories.superbwarfare"); @SubscribeEvent public static void registerKeyMappings(RegisterKeyMappingsEvent event) { @@ -97,6 +99,8 @@ public class ModKeyMappings { event.register(EDIT_STOCK); event.register(EDIT_GRIP); event.register(FIRE); + event.register(HOLD_ZOOM); + event.register(SWITCH_ZOOM); } @Mod.EventBusSubscriber(value = Dist.CLIENT) diff --git a/src/main/java/net/mcreator/superbwarfare/mixins/MouseHandlerMixin.java b/src/main/java/net/mcreator/superbwarfare/mixins/MouseHandlerMixin.java index 24d47f632..85cb08675 100644 --- a/src/main/java/net/mcreator/superbwarfare/mixins/MouseHandlerMixin.java +++ b/src/main/java/net/mcreator/superbwarfare/mixins/MouseHandlerMixin.java @@ -9,7 +9,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.MouseHandler; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; -import org.lwjgl.glfw.GLFW; import org.objectweb.asm.Opcodes; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @@ -37,7 +36,7 @@ public class MouseHandlerMixin { ItemStack stack = mc.player.getMainHandItem(); if (player.getVehicle() != null && player.getVehicle() instanceof ICannonEntity && !stack.is(ModTags.Items.GUN)) { - if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) { + if (ClientEventHandler.zoom) { return 0.15; } else { return 0.3; diff --git a/src/main/resources/assets/superbwarfare/lang/en_us.json b/src/main/resources/assets/superbwarfare/lang/en_us.json index df496783a..1a35adae4 100644 --- a/src/main/resources/assets/superbwarfare/lang/en_us.json +++ b/src/main/resources/assets/superbwarfare/lang/en_us.json @@ -333,6 +333,8 @@ "entity.superbwarfare.drone": "Drone", "key.categories.superbwarfare": "Superb Warfare", + "key.superbwarfare.hold_zoom": "Hold to zoom", + "key.superbwarfare.switch_zoom": "Switch to zoom", "key.superbwarfare.fire": "Fire", "key.superbwarfare.reload": "Reload", "key.superbwarfare.fire_mode": "Fire Mode", diff --git a/src/main/resources/assets/superbwarfare/lang/zh_cn.json b/src/main/resources/assets/superbwarfare/lang/zh_cn.json index 4cc2a107d..d9d8286f9 100644 --- a/src/main/resources/assets/superbwarfare/lang/zh_cn.json +++ b/src/main/resources/assets/superbwarfare/lang/zh_cn.json @@ -333,6 +333,8 @@ "entity.superbwarfare.drone": "无人机", "key.categories.superbwarfare": "卓越前线", + "key.superbwarfare.hold_zoom": "按住瞄准", + "key.superbwarfare.switch_zoom": "切换瞄准", "key.superbwarfare.fire": "开火", "key.superbwarfare.reload": "装填子弹", "key.superbwarfare.fire_mode": "开火模式",