diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/Hk416ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/Hk416ItemModel.java index fee78b85d..69dbd1f14 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/Hk416ItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/Hk416ItemModel.java @@ -125,7 +125,7 @@ public class Hk416ItemModel extends GeoModel { shen.setPosX(-0.4f * (float) (ClientEventHandler.recoilHorizon * (0.5 + 0.4 * ClientEventHandler.fireSpread))); shen.setPosY((float) (0.15f * fp + 0.18f * fr)); - shen.setPosZ((float) (0.475 * fp + 0.64f * fr + 1.15 * fpz)); + shen.setPosZ((float) (0.375 * fp + 0.44f * fr + 0.75 * fpz)); shen.setRotX((float) (0.01f * fp + 0.05f * fr + 0.01f * fpz)); shen.setRotY(fireRotY); shen.setRotZ(fireRotZ); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/HuntingRifleItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/HuntingRifleItemModel.java index 4383f9cca..635e9920a 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/HuntingRifleItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/HuntingRifleItemModel.java @@ -83,17 +83,6 @@ public class HuntingRifleItemModel extends GeoModel { shen.setRotY((float) (shen.getRotY() * (1 - 0.7 * zt))); shen.setRotZ((float) (shen.getRotZ() * (1 - 0.65 * zt))); - CoreGeoBone flare = getAnimationProcessor().getBone("flare"); - - if (stack.getOrCreateTag().getDouble("flash_time") > 0) { - flare.setHidden(false); - flare.setScaleX((float) (1 + 0.5 * (Math.random() - 0.5))); - flare.setScaleY((float) (1 + 0.5 * (Math.random() - 0.5))); - flare.setRotZ((float) (0.5 * (Math.random() - 0.5))); - } else { - flare.setHidden(true); - } - CoreGeoBone root = getAnimationProcessor().getBone("root"); root.setPosX((float) (movePosX + 20 * ClientEventHandler.drawTime + 9.3f * mph)); root.setPosY((float) (swayY + movePosY - 40 * ClientEventHandler.drawTime - 2f * vY)); diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/M4ItemModel.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/M4ItemModel.java index c268d4511..b1cb65de2 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/M4ItemModel.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/M4ItemModel.java @@ -143,7 +143,7 @@ public class M4ItemModel extends GeoModel { shen.setPosX(-0.4f * (float) (ClientEventHandler.recoilHorizon * (0.5 + 0.4 * ClientEventHandler.fireSpread))); shen.setPosY((float) (0.15f * fp + 0.18f * fr)); - shen.setPosZ((float) (0.475 * fp + 0.64f * fr + 1.15 * fpz)); + shen.setPosZ((float) (0.375 * fp + 0.44f * fr + 0.75 * fpz)); shen.setRotX((float) (0.01f * fp + 0.05f * fr + 0.01f * fpz)); shen.setRotY(fireRotY); shen.setRotZ(fireRotZ); 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 4f010bc82..adebc02f7 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 @@ -6,6 +6,7 @@ import net.mcreator.superbwarfare.client.AnimationHelper; import net.mcreator.superbwarfare.client.ItemModelHelper; import net.mcreator.superbwarfare.client.layer.AK12Layer; import net.mcreator.superbwarfare.client.model.item.AK12ItemModel; +import net.mcreator.superbwarfare.event.ClientEventHandler; import net.mcreator.superbwarfare.item.gun.rifle.AK12Item; import net.mcreator.superbwarfare.tools.GunsTool; import net.minecraft.client.Minecraft; @@ -116,7 +117,7 @@ public class AK12ItemRenderer extends GeoItemRenderer { if (GunsTool.getAttachmentType(itemStack, GunsTool.AttachmentType.BARREL) == 1) { bone.setPosZ(2.25f); } - if (itemStack.getOrCreateTag().getDouble("flash_time") == 0 || GunsTool.getAttachmentType(itemStack, GunsTool.AttachmentType.BARREL) == 2) { + if (ClientEventHandler.firePosTimer == 0 || ClientEventHandler.firePosTimer > 0.5 || GunsTool.getAttachmentType(itemStack, GunsTool.AttachmentType.BARREL) == 2) { bone.setHidden(true); } else { bone.setHidden(false); 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 a1172358c..94d450ddc 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 @@ -6,6 +6,7 @@ import net.mcreator.superbwarfare.client.AnimationHelper; import net.mcreator.superbwarfare.client.ItemModelHelper; import net.mcreator.superbwarfare.client.layer.AK47Layer; import net.mcreator.superbwarfare.client.model.item.AK47ItemModel; +import net.mcreator.superbwarfare.event.ClientEventHandler; import net.mcreator.superbwarfare.item.gun.rifle.AK47Item; import net.mcreator.superbwarfare.tools.GunsTool; import net.minecraft.client.Minecraft; @@ -113,7 +114,7 @@ public class AK47ItemRenderer extends GeoItemRenderer { } if (name.equals("flare")) { - if (itemStack.getOrCreateTag().getDouble("flash_time") == 0 || GunsTool.getAttachmentType(itemStack, GunsTool.AttachmentType.BARREL) == 2) { + if (ClientEventHandler.firePosTimer == 0 || ClientEventHandler.firePosTimer > 0.5 || GunsTool.getAttachmentType(itemStack, GunsTool.AttachmentType.BARREL) == 2) { bone.setHidden(true); } else { bone.setHidden(false); 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 ab222deed..090044f45 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 @@ -2,10 +2,13 @@ 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.ItemModelHelper; import net.mcreator.superbwarfare.client.layer.Aa12Layer; import net.mcreator.superbwarfare.client.model.item.Aa12ItemModel; +import net.mcreator.superbwarfare.event.ClientEventHandler; import net.mcreator.superbwarfare.item.gun.shotgun.Aa12Item; -import net.mcreator.superbwarfare.client.AnimationHelper; +import net.mcreator.superbwarfare.tools.GunsTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.PlayerModel; import net.minecraft.client.player.AbstractClientPlayer; @@ -77,30 +80,63 @@ public class Aa12ItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - if (name.equals("flare")) { - Player player = Minecraft.getInstance().player; - ItemStack itemStack = null; - if (player != null) { - itemStack = player.getMainHandItem(); - } - if (itemStack != null && itemStack.getOrCreateTag().getDouble("flash_time") > 0) { - bone.setHidden(false); - bone.setScaleX((float) (1 + 0.5 * (Math.random() - 0.5))); - bone.setScaleY((float) (1 + 0.5 * (Math.random() - 0.5))); - bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); - } else { - bone.setHidden(true); + Player player = mc.player; + 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 { + bone.setHidden(false); + bone.setScaleX((float) (0.75 + 0.5 * (Math.random() - 0.5))); + bone.setScaleY((float) (0.75 + 0.5 * (Math.random() - 0.5))); + bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); + } } + + ItemModelHelper.handleGunAttachments(bone, itemStack, name); } if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer player = mc.player; + AbstractClientPlayer localPlayer = mc.player; - if (player == null) { + if (localPlayer == null) { return; } - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtils.translateMatrixToBone(stack, bone); @@ -108,7 +144,7 @@ public class Aa12ItemRenderer extends GeoItemRenderer { RenderUtils.rotateMatrixAroundBone(stack, bone); RenderUtils.scaleMatrixForBone(stack, bone); RenderUtils.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = player.getSkinTextureLocation(); + ResourceLocation loc = localPlayer.getSkinTextureLocation(); VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); if (name.equals("Lefthand")) { diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/AbekiriItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/AbekiriItemRenderer.java index 147a41647..eaa623016 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/AbekiriItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/AbekiriItemRenderer.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.AbekiriLayer; import net.mcreator.superbwarfare.client.model.item.AbekiriItemModel; +import net.mcreator.superbwarfare.event.ClientEventHandler; import net.mcreator.superbwarfare.item.gun.shotgun.AbekiriItem; -import net.mcreator.superbwarfare.client.AnimationHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.model.PlayerModel; import net.minecraft.client.player.AbstractClientPlayer; @@ -77,30 +78,29 @@ public class AbekiriItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - if (name.equals("flare")) { - Player player = Minecraft.getInstance().player; - ItemStack itemStack = null; - if (player != null) { - itemStack = player.getMainHandItem(); - } - if (itemStack != null && itemStack.getOrCreateTag().getDouble("flash_time") > 0) { - bone.setHidden(false); - bone.setScaleX((float) (1 + 0.5 * (Math.random() - 0.5))); - bone.setScaleY((float) (1 + 0.5 * (Math.random() - 0.5))); - bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); - } else { - bone.setHidden(true); + Player player = mc.player; + if (player != null) { + + if (name.equals("flare")) { + if (ClientEventHandler.firePosTimer == 0 || ClientEventHandler.firePosTimer > 0.5) { + bone.setHidden(true); + } else { + bone.setHidden(false); + bone.setScaleX((float) (0.75 + 0.5 * (Math.random() - 0.5))); + bone.setScaleY((float) (0.75 + 0.5 * (Math.random() - 0.5))); + bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); + } } } if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer player = mc.player; + AbstractClientPlayer localPlayer = mc.player; - if (player == null) { + if (localPlayer == null) { return; } - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtils.translateMatrixToBone(stack, bone); @@ -108,7 +108,7 @@ public class AbekiriItemRenderer extends GeoItemRenderer { RenderUtils.rotateMatrixAroundBone(stack, bone); RenderUtils.scaleMatrixForBone(stack, bone); RenderUtils.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = player.getSkinTextureLocation(); + ResourceLocation loc = localPlayer.getSkinTextureLocation(); VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); if (name.equals("Lefthand")) { 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 276c7ef2f..7c1288bd7 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 @@ -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.DevotionLayer; import net.mcreator.superbwarfare.client.model.item.DevotionItemModel; +import net.mcreator.superbwarfare.event.ClientEventHandler; import net.mcreator.superbwarfare.item.gun.machinegun.DevotionItem; -import net.mcreator.superbwarfare.client.AnimationHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.model.PlayerModel; import net.minecraft.client.player.AbstractClientPlayer; @@ -78,42 +79,33 @@ public class DevotionItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - if (name.equals("flare")) { - Player player = Minecraft.getInstance().player; - ItemStack itemStack = null; - if (player != null) { - itemStack = player.getMainHandItem(); + Player player = mc.player; + if (player != null) { + if (name.equals("flare")) { + if (ClientEventHandler.firePosTimer == 0 || ClientEventHandler.firePosTimer > 0.5) { + bone.setHidden(true); + } else { + bone.setHidden(false); + bone.setScaleX((float) (0.75 + 0.5 * (Math.random() - 0.5))); + bone.setScaleY((float) (0.75 + 0.5 * (Math.random() - 0.5))); + bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); + } } - if (itemStack != null && itemStack.getOrCreateTag().getDouble("flash_time") > 0) { - bone.setHidden(false); - bone.setScaleX((float) (0.55 + 0.5 * (Math.random() - 0.5))); - bone.setScaleY((float) (0.55 + 0.5 * (Math.random() - 0.5))); - bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); - } else { - bone.setHidden(true); - } - } - if (name.equals("holo")) { - Player player = Minecraft.getInstance().player; - ItemStack itemStack = null; - if (player != null) { - itemStack = player.getMainHandItem(); - } - if (player != null) { + 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); } } - if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer player = mc.player; + AbstractClientPlayer localPlayer = mc.player; - if (player == null) { + if (localPlayer == null) { return; } - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtils.translateMatrixToBone(stack, bone); @@ -121,7 +113,7 @@ public class DevotionItemRenderer extends GeoItemRenderer { RenderUtils.rotateMatrixAroundBone(stack, bone); RenderUtils.scaleMatrixForBone(stack, bone); RenderUtils.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = player.getSkinTextureLocation(); + ResourceLocation loc = localPlayer.getSkinTextureLocation(); VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); if (name.equals("Lefthand")) { diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Glock17ItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Glock17ItemRenderer.java index 307b100ab..8221655c6 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Glock17ItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Glock17ItemRenderer.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.Glock17Layer; import net.mcreator.superbwarfare.client.model.item.Glock17ItemModel; +import net.mcreator.superbwarfare.event.ClientEventHandler; import net.mcreator.superbwarfare.item.gun.handgun.Glock17Item; -import net.mcreator.superbwarfare.client.AnimationHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.model.PlayerModel; import net.minecraft.client.player.AbstractClientPlayer; @@ -77,30 +78,29 @@ public class Glock17ItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - if (name.equals("flare")) { - Player player = Minecraft.getInstance().player; - ItemStack itemStack = null; - if (player != null) { - itemStack = player.getMainHandItem(); - } - if (itemStack != null && itemStack.getOrCreateTag().getDouble("flash_time") > 0) { - bone.setHidden(false); - bone.setScaleX((float) (0.55 + 0.5 * (Math.random() - 0.5))); - bone.setScaleY((float) (0.55 + 0.5 * (Math.random() - 0.5))); - bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); - } else { - bone.setHidden(true); + Player player = mc.player; + if (player != null) { + + if (name.equals("flare")) { + if (ClientEventHandler.firePosTimer == 0 || ClientEventHandler.firePosTimer > 0.5) { + bone.setHidden(true); + } else { + bone.setHidden(false); + bone.setScaleX((float) (0.75 + 0.5 * (Math.random() - 0.5))); + bone.setScaleY((float) (0.75 + 0.5 * (Math.random() - 0.5))); + bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); + } } } if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer player = mc.player; + AbstractClientPlayer localPlayer = mc.player; - if (player == null) { + if (localPlayer == null) { return; } - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtils.translateMatrixToBone(stack, bone); @@ -108,7 +108,7 @@ public class Glock17ItemRenderer extends GeoItemRenderer { RenderUtils.rotateMatrixAroundBone(stack, bone); RenderUtils.scaleMatrixForBone(stack, bone); RenderUtils.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = player.getSkinTextureLocation(); + ResourceLocation loc = localPlayer.getSkinTextureLocation(); VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); if (name.equals("Lefthand")) { diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Glock18ItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Glock18ItemRenderer.java index 7be450384..53a503d28 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Glock18ItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/Glock18ItemRenderer.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.Glock18Layer; import net.mcreator.superbwarfare.client.model.item.Glock18ItemModel; +import net.mcreator.superbwarfare.event.ClientEventHandler; import net.mcreator.superbwarfare.item.gun.handgun.Glock18Item; -import net.mcreator.superbwarfare.client.AnimationHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.model.PlayerModel; import net.minecraft.client.player.AbstractClientPlayer; @@ -77,30 +78,29 @@ public class Glock18ItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - if (name.equals("flare")) { - Player player = Minecraft.getInstance().player; - ItemStack itemStack = null; - if (player != null) { - itemStack = player.getMainHandItem(); - } - if (itemStack != null && itemStack.getOrCreateTag().getDouble("flash_time") > 0) { - bone.setHidden(false); - bone.setScaleX((float) (0.55 + 0.5 * (Math.random() - 0.5))); - bone.setScaleY((float) (0.55 + 0.5 * (Math.random() - 0.5))); - bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); - } else { - bone.setHidden(true); + Player player = mc.player; + if (player != null) { + + if (name.equals("flare")) { + if (ClientEventHandler.firePosTimer == 0 || ClientEventHandler.firePosTimer > 0.5) { + bone.setHidden(true); + } else { + bone.setHidden(false); + bone.setScaleX((float) (0.75 + 0.5 * (Math.random() - 0.5))); + bone.setScaleY((float) (0.75 + 0.5 * (Math.random() - 0.5))); + bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); + } } } if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer player = mc.player; + AbstractClientPlayer localPlayer = mc.player; - if (player == null) { + if (localPlayer == null) { return; } - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtils.translateMatrixToBone(stack, bone); @@ -108,7 +108,7 @@ public class Glock18ItemRenderer extends GeoItemRenderer { RenderUtils.rotateMatrixAroundBone(stack, bone); RenderUtils.scaleMatrixForBone(stack, bone); RenderUtils.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = player.getSkinTextureLocation(); + ResourceLocation loc = localPlayer.getSkinTextureLocation(); VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); if (name.equals("Lefthand")) { 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 b84049a89..5cd644766 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 @@ -6,6 +6,7 @@ import net.mcreator.superbwarfare.client.AnimationHelper; import net.mcreator.superbwarfare.client.ItemModelHelper; import net.mcreator.superbwarfare.client.layer.Hk416Layer; import net.mcreator.superbwarfare.client.model.item.Hk416ItemModel; +import net.mcreator.superbwarfare.event.ClientEventHandler; import net.mcreator.superbwarfare.item.gun.rifle.Hk416Item; import net.mcreator.superbwarfare.tools.GunsTool; import net.minecraft.client.Minecraft; @@ -80,22 +81,6 @@ public class Hk416ItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - if (name.equals("flare")) { - Player player = Minecraft.getInstance().player; - ItemStack itemStack = null; - if (player != null) { - itemStack = player.getMainHandItem(); - } - if (itemStack != null && itemStack.getOrCreateTag().getDouble("flash_time") > 0) { - bone.setHidden(false); - bone.setScaleX((float) (0.55 + 0.5 * (Math.random() - 0.5))); - bone.setScaleY((float) (0.55 + 0.5 * (Math.random() - 0.5))); - bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); - } else { - bone.setHidden(true); - } - } - Player player = mc.player; if (player != null) { ItemStack itemStack = player.getMainHandItem(); @@ -129,7 +114,7 @@ public class Hk416ItemRenderer extends GeoItemRenderer { } if (name.equals("flare")) { - if (itemStack.getOrCreateTag().getDouble("flash_time") == 0 || GunsTool.getAttachmentType(itemStack, GunsTool.AttachmentType.BARREL) == 2) { + if (ClientEventHandler.firePosTimer == 0 || ClientEventHandler.firePosTimer > 0.5 || GunsTool.getAttachmentType(itemStack, GunsTool.AttachmentType.BARREL) == 2) { bone.setHidden(true); } else { bone.setHidden(false); diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/HuntingRifleItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/HuntingRifleItemRenderer.java index acdb71e01..c98264832 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/HuntingRifleItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/HuntingRifleItemRenderer.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.HuntingRifleLayer; import net.mcreator.superbwarfare.client.model.item.HuntingRifleItemModel; +import net.mcreator.superbwarfare.event.ClientEventHandler; import net.mcreator.superbwarfare.item.gun.sniper.HuntingRifleItem; -import net.mcreator.superbwarfare.client.AnimationHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.model.PlayerModel; import net.minecraft.client.player.AbstractClientPlayer; @@ -77,30 +78,29 @@ public class HuntingRifleItemRenderer extends GeoItemRenderer bone.setHidden(this.hiddenBones.contains(name)); } - if (name.equals("flare")) { - Player player = Minecraft.getInstance().player; - ItemStack itemStack = null; - if (player != null) { - itemStack = player.getMainHandItem(); - } - if (itemStack != null && itemStack.getOrCreateTag().getDouble("flash_time") > 0) { - bone.setHidden(false); - bone.setScaleX((float) (0.55 + 0.5 * (Math.random() - 0.5))); - bone.setScaleY((float) (0.55 + 0.5 * (Math.random() - 0.5))); - bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); - } else { - bone.setHidden(true); + Player player = mc.player; + if (player != null) { + + if (name.equals("flare")) { + if (ClientEventHandler.firePosTimer == 0 || ClientEventHandler.firePosTimer > 0.5) { + bone.setHidden(true); + } else { + bone.setHidden(false); + bone.setScaleX((float) (0.75 + 0.5 * (Math.random() - 0.5))); + bone.setScaleY((float) (0.75 + 0.5 * (Math.random() - 0.5))); + bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); + } } } if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer player = mc.player; + AbstractClientPlayer localPlayer = mc.player; - if (player == null) { + if (localPlayer == null) { return; } - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtils.translateMatrixToBone(stack, bone); @@ -108,7 +108,7 @@ public class HuntingRifleItemRenderer extends GeoItemRenderer RenderUtils.rotateMatrixAroundBone(stack, bone); RenderUtils.scaleMatrixForBone(stack, bone); RenderUtils.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = player.getSkinTextureLocation(); + ResourceLocation loc = localPlayer.getSkinTextureLocation(); VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); if (name.equals("Lefthand")) { diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/K98ItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/K98ItemRenderer.java index 3adcbc50b..e0bc98018 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/K98ItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/K98ItemRenderer.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.K98Layer; import net.mcreator.superbwarfare.client.model.item.K98ItemModel; +import net.mcreator.superbwarfare.event.ClientEventHandler; import net.mcreator.superbwarfare.item.gun.sniper.K98Item; -import net.mcreator.superbwarfare.client.AnimationHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.model.PlayerModel; import net.minecraft.client.player.AbstractClientPlayer; @@ -77,30 +78,29 @@ public class K98ItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - if (name.equals("flare")) { - Player player = Minecraft.getInstance().player; - ItemStack itemStack = null; - if (player != null) { - itemStack = player.getMainHandItem(); - } - if (itemStack != null && itemStack.getOrCreateTag().getDouble("flash_time") > 0) { - bone.setHidden(false); - bone.setScaleX((float) (0.7 + 0.5 * (Math.random() - 0.5))); - bone.setScaleY((float) (0.7 + 0.5 * (Math.random() - 0.5))); - bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); - } else { - bone.setHidden(true); + Player player = mc.player; + if (player != null) { + + if (name.equals("flare")) { + if (ClientEventHandler.firePosTimer == 0 || ClientEventHandler.firePosTimer > 0.5) { + bone.setHidden(true); + } else { + bone.setHidden(false); + bone.setScaleX((float) (0.75 + 0.5 * (Math.random() - 0.5))); + bone.setScaleY((float) (0.75 + 0.5 * (Math.random() - 0.5))); + bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); + } } } if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer player = mc.player; + AbstractClientPlayer localPlayer = mc.player; - if (player == null) { + if (localPlayer == null) { return; } - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtils.translateMatrixToBone(stack, bone); @@ -108,7 +108,7 @@ public class K98ItemRenderer extends GeoItemRenderer { RenderUtils.rotateMatrixAroundBone(stack, bone); RenderUtils.scaleMatrixForBone(stack, bone); RenderUtils.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = player.getSkinTextureLocation(); + ResourceLocation loc = localPlayer.getSkinTextureLocation(); VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); if (name.equals("Lefthand")) { diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/M1911ItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/M1911ItemRenderer.java index 70bcb8c44..bcb1ae640 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/M1911ItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/M1911ItemRenderer.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.M1911Layer; import net.mcreator.superbwarfare.client.model.item.M1911ItemModel; +import net.mcreator.superbwarfare.event.ClientEventHandler; import net.mcreator.superbwarfare.item.gun.handgun.M1911Item; -import net.mcreator.superbwarfare.client.AnimationHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.model.PlayerModel; import net.minecraft.client.player.AbstractClientPlayer; @@ -77,30 +78,29 @@ public class M1911ItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - if (name.equals("flare")) { - Player player = Minecraft.getInstance().player; - ItemStack itemStack = null; - if (player != null) { - itemStack = player.getMainHandItem(); - } - if (itemStack != null && itemStack.getOrCreateTag().getDouble("flash_time") > 0) { - bone.setHidden(false); - bone.setScaleX((float) (0.55 + 0.5 * (Math.random() - 0.5))); - bone.setScaleY((float) (0.55 + 0.5 * (Math.random() - 0.5))); - bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); - } else { - bone.setHidden(true); + Player player = mc.player; + if (player != null) { + + if (name.equals("flare")) { + if (ClientEventHandler.firePosTimer == 0 || ClientEventHandler.firePosTimer > 0.5) { + bone.setHidden(true); + } else { + bone.setHidden(false); + bone.setScaleX((float) (0.75 + 0.5 * (Math.random() - 0.5))); + bone.setScaleY((float) (0.75 + 0.5 * (Math.random() - 0.5))); + bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); + } } } if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer player = mc.player; + AbstractClientPlayer localPlayer = mc.player; - if (player == null) { + if (localPlayer == null) { return; } - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtils.translateMatrixToBone(stack, bone); @@ -108,7 +108,7 @@ public class M1911ItemRenderer extends GeoItemRenderer { RenderUtils.rotateMatrixAroundBone(stack, bone); RenderUtils.scaleMatrixForBone(stack, bone); RenderUtils.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = player.getSkinTextureLocation(); + ResourceLocation loc = localPlayer.getSkinTextureLocation(); VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); if (name.equals("Lefthand")) { 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 c32a1b4ab..96e54fe44 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 @@ -6,6 +6,7 @@ import net.mcreator.superbwarfare.client.AnimationHelper; import net.mcreator.superbwarfare.client.ItemModelHelper; import net.mcreator.superbwarfare.client.layer.M4Layer; import net.mcreator.superbwarfare.client.model.item.M4ItemModel; +import net.mcreator.superbwarfare.event.ClientEventHandler; import net.mcreator.superbwarfare.item.gun.rifle.M4Item; import net.mcreator.superbwarfare.tools.GunsTool; import net.minecraft.client.Minecraft; @@ -80,22 +81,6 @@ public class M4ItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - if (name.equals("flare")) { - Player player = Minecraft.getInstance().player; - ItemStack itemStack = null; - if (player != null) { - itemStack = player.getMainHandItem(); - } - if (itemStack != null && itemStack.getOrCreateTag().getDouble("flash_time") > 0) { - bone.setHidden(false); - bone.setScaleX((float) (0.55 + 0.5 * (Math.random() - 0.5))); - bone.setScaleY((float) (0.55 + 0.5 * (Math.random() - 0.5))); - bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); - } else { - bone.setHidden(true); - } - } - Player player = mc.player; if (player != null) { ItemStack itemStack = player.getMainHandItem(); @@ -136,7 +121,7 @@ public class M4ItemRenderer extends GeoItemRenderer { } if (name.equals("flare")) { - if (itemStack.getOrCreateTag().getDouble("flash_time") == 0 || GunsTool.getAttachmentType(itemStack, GunsTool.AttachmentType.BARREL) == 2) { + if (ClientEventHandler.firePosTimer == 0 || ClientEventHandler.firePosTimer > 0.5 || GunsTool.getAttachmentType(itemStack, GunsTool.AttachmentType.BARREL) == 2) { bone.setHidden(true); } else { bone.setHidden(false); diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/M60ItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/M60ItemRenderer.java index b4cdd5488..384e79b7e 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/M60ItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/M60ItemRenderer.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.M60Layer; import net.mcreator.superbwarfare.client.model.item.M60ItemModel; +import net.mcreator.superbwarfare.event.ClientEventHandler; import net.mcreator.superbwarfare.item.gun.machinegun.M60Item; -import net.mcreator.superbwarfare.client.AnimationHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.model.PlayerModel; import net.minecraft.client.player.AbstractClientPlayer; @@ -77,30 +78,29 @@ public class M60ItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - if (name.equals("flare")) { - Player player = Minecraft.getInstance().player; - ItemStack itemStack = null; - if (player != null) { - itemStack = player.getMainHandItem(); - } - if (itemStack != null && itemStack.getOrCreateTag().getDouble("flash_time") > 0) { - bone.setHidden(false); - bone.setScaleX((float) (0.55 + 0.5 * (Math.random() - 0.5))); - bone.setScaleY((float) (0.55 + 0.5 * (Math.random() - 0.5))); - bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); - } else { - bone.setHidden(true); + Player player = mc.player; + if (player != null) { + + if (name.equals("flare")) { + if (ClientEventHandler.firePosTimer == 0 || ClientEventHandler.firePosTimer > 0.5) { + bone.setHidden(true); + } else { + bone.setHidden(false); + bone.setScaleX((float) (0.75 + 0.5 * (Math.random() - 0.5))); + bone.setScaleY((float) (0.75 + 0.5 * (Math.random() - 0.5))); + bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); + } } } if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer player = mc.player; + AbstractClientPlayer localPlayer = mc.player; - if (player == null) { + if (localPlayer == null) { return; } - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtils.translateMatrixToBone(stack, bone); @@ -108,7 +108,7 @@ public class M60ItemRenderer extends GeoItemRenderer { RenderUtils.rotateMatrixAroundBone(stack, bone); RenderUtils.scaleMatrixForBone(stack, bone); RenderUtils.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = player.getSkinTextureLocation(); + ResourceLocation loc = localPlayer.getSkinTextureLocation(); VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); if (name.equals("Lefthand")) { diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/M79ItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/M79ItemRenderer.java index 988f4ab7c..84759d6c1 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/M79ItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/M79ItemRenderer.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.M79Layer; import net.mcreator.superbwarfare.client.model.item.M79ItemModel; +import net.mcreator.superbwarfare.event.ClientEventHandler; import net.mcreator.superbwarfare.item.gun.launcher.M79Item; -import net.mcreator.superbwarfare.client.AnimationHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.model.PlayerModel; import net.minecraft.client.player.AbstractClientPlayer; @@ -77,30 +78,29 @@ public class M79ItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - if (name.equals("flare")) { - Player player = Minecraft.getInstance().player; - ItemStack itemStack = null; - if (player != null) { - itemStack = player.getMainHandItem(); - } - if (itemStack != null && itemStack.getOrCreateTag().getDouble("flash_time") > 0) { - bone.setHidden(false); - bone.setScaleX((float) (0.55 + 0.5 * (Math.random() - 0.5))); - bone.setScaleY((float) (0.55 + 0.5 * (Math.random() - 0.5))); - bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); - } else { - bone.setHidden(true); + Player player = mc.player; + if (player != null) { + + if (name.equals("flare")) { + if (ClientEventHandler.firePosTimer == 0 || ClientEventHandler.firePosTimer > 0.5) { + bone.setHidden(true); + } else { + bone.setHidden(false); + bone.setScaleX((float) (0.75 + 0.5 * (Math.random() - 0.5))); + bone.setScaleY((float) (0.75 + 0.5 * (Math.random() - 0.5))); + bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); + } } } if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer player = mc.player; + AbstractClientPlayer localPlayer = mc.player; - if (player == null) { + if (localPlayer == null) { return; } - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtils.translateMatrixToBone(stack, bone); @@ -108,7 +108,7 @@ public class M79ItemRenderer extends GeoItemRenderer { RenderUtils.rotateMatrixAroundBone(stack, bone); RenderUtils.scaleMatrixForBone(stack, bone); RenderUtils.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = player.getSkinTextureLocation(); + ResourceLocation loc = localPlayer.getSkinTextureLocation(); VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); if (name.equals("Lefthand")) { diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/M870ItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/M870ItemRenderer.java index 741fbe000..67f456957 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/M870ItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/M870ItemRenderer.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.M870Layer; import net.mcreator.superbwarfare.client.model.item.M870ItemModel; +import net.mcreator.superbwarfare.event.ClientEventHandler; import net.mcreator.superbwarfare.item.gun.shotgun.M870Item; -import net.mcreator.superbwarfare.client.AnimationHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.model.PlayerModel; import net.minecraft.client.player.AbstractClientPlayer; @@ -77,30 +78,29 @@ public class M870ItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - if (name.equals("flare")) { - Player player = Minecraft.getInstance().player; - ItemStack itemStack = null; - if (player != null) { - itemStack = player.getMainHandItem(); - } - if (itemStack != null && itemStack.getOrCreateTag().getDouble("flash_time") > 0) { - bone.setHidden(false); - bone.setScaleX((float) (0.55 + 0.5 * (Math.random() - 0.5))); - bone.setScaleY((float) (0.55 + 0.5 * (Math.random() - 0.5))); - bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); - } else { - bone.setHidden(true); + Player player = mc.player; + if (player != null) { + + if (name.equals("flare")) { + if (ClientEventHandler.firePosTimer == 0 || ClientEventHandler.firePosTimer > 0.5) { + bone.setHidden(true); + } else { + bone.setHidden(false); + bone.setScaleX((float) (0.75 + 0.5 * (Math.random() - 0.5))); + bone.setScaleY((float) (0.75 + 0.5 * (Math.random() - 0.5))); + bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); + } } } if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer player = mc.player; + AbstractClientPlayer localPlayer = mc.player; - if (player == null) { + if (localPlayer == null) { return; } - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtils.translateMatrixToBone(stack, bone); @@ -108,7 +108,7 @@ public class M870ItemRenderer extends GeoItemRenderer { RenderUtils.rotateMatrixAroundBone(stack, bone); RenderUtils.scaleMatrixForBone(stack, bone); RenderUtils.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = player.getSkinTextureLocation(); + ResourceLocation loc = localPlayer.getSkinTextureLocation(); VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); if (name.equals("Lefthand")) { 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 6bf886ccd..21abbea59 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 @@ -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.M98bLayer; import net.mcreator.superbwarfare.client.model.item.M98bItemModel; +import net.mcreator.superbwarfare.event.ClientEventHandler; import net.mcreator.superbwarfare.item.gun.sniper.M98bItem; -import net.mcreator.superbwarfare.client.AnimationHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.model.PlayerModel; import net.minecraft.client.player.AbstractClientPlayer; @@ -78,48 +79,38 @@ public class M98bItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - if (name.equals("flare")) { - Player player = Minecraft.getInstance().player; - ItemStack itemStack = null; - if (player != null) { - itemStack = player.getMainHandItem(); - } - if (itemStack != null && itemStack.getOrCreateTag().getDouble("flash_time") > 0) { - bone.setHidden(false); - bone.setScaleX((float) (0.55 + 0.5 * (Math.random() - 0.5))); - bone.setScaleY((float) (0.55 + 0.5 * (Math.random() - 0.5))); - bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); - } else { - bone.setHidden(true); - } - } + Player player = mc.player; + if (player != null) { + ItemStack itemStack = player.getMainHandItem(); - if (name.equals("scope2")) { - Player player = Minecraft.getInstance().player; - ItemStack itemStack = null; - if (player != null) { - itemStack = player.getMainHandItem(); + if (name.equals("flare")) { + if (ClientEventHandler.firePosTimer == 0 || ClientEventHandler.firePosTimer > 0.5) { + bone.setHidden(true); + } else { + bone.setHidden(false); + bone.setScaleX((float) (0.75 + 0.5 * (Math.random() - 0.5))); + bone.setScaleY((float) (0.75 + 0.5 * (Math.random() - 0.5))); + bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); + } } - bone.setHidden((itemStack != null && itemStack.getOrCreateTag().getBoolean("HoloHidden")) || GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) != GLFW.GLFW_PRESS); - } - if (name.equals("qiang")) { - Player player = Minecraft.getInstance().player; - ItemStack itemStack = null; - if (player != null) { - itemStack = player.getMainHandItem(); + if (name.equals("scope2")) { + bone.setHidden(itemStack.getOrCreateTag().getBoolean("HoloHidden") || GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) != GLFW.GLFW_PRESS); + } + + if (name.equals("qiang")) { + bone.setHidden(!itemStack.getOrCreateTag().getBoolean("HoloHidden")); } - bone.setHidden(itemStack != null && !itemStack.getOrCreateTag().getBoolean("HoloHidden")); } if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer player = mc.player; + AbstractClientPlayer localPlayer = mc.player; - if (player == null) { + if (localPlayer == null) { return; } - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtils.translateMatrixToBone(stack, bone); @@ -127,7 +118,7 @@ public class M98bItemRenderer extends GeoItemRenderer { RenderUtils.rotateMatrixAroundBone(stack, bone); RenderUtils.scaleMatrixForBone(stack, bone); RenderUtils.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = player.getSkinTextureLocation(); + ResourceLocation loc = localPlayer.getSkinTextureLocation(); VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); if (name.equals("Lefthand")) { diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/MarlinItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/MarlinItemRenderer.java index 974beee65..8373488ec 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/MarlinItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/MarlinItemRenderer.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.MarlinLayer; import net.mcreator.superbwarfare.client.model.item.MarlinItemModel; +import net.mcreator.superbwarfare.event.ClientEventHandler; import net.mcreator.superbwarfare.item.gun.rifle.MarlinItem; -import net.mcreator.superbwarfare.client.AnimationHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.model.PlayerModel; import net.minecraft.client.player.AbstractClientPlayer; @@ -77,30 +78,29 @@ public class MarlinItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - if (name.equals("flare")) { - Player player = Minecraft.getInstance().player; - ItemStack itemStack = null; - if (player != null) { - itemStack = player.getMainHandItem(); - } - if (itemStack != null && itemStack.getOrCreateTag().getDouble("flash_time") > 0) { - bone.setHidden(false); - bone.setScaleX((float) (0.55 + 0.5 * (Math.random() - 0.5))); - bone.setScaleY((float) (0.55 + 0.5 * (Math.random() - 0.5))); - bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); - } else { - bone.setHidden(true); + Player player = mc.player; + if (player != null) { + + if (name.equals("flare")) { + if (ClientEventHandler.firePosTimer == 0 || ClientEventHandler.firePosTimer > 0.5) { + bone.setHidden(true); + } else { + bone.setHidden(false); + bone.setScaleX((float) (0.75 + 0.5 * (Math.random() - 0.5))); + bone.setScaleY((float) (0.75 + 0.5 * (Math.random() - 0.5))); + bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); + } } } if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer player = mc.player; + AbstractClientPlayer localPlayer = mc.player; - if (player == null) { + if (localPlayer == null) { return; } - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtils.translateMatrixToBone(stack, bone); @@ -108,7 +108,7 @@ public class MarlinItemRenderer extends GeoItemRenderer { RenderUtils.rotateMatrixAroundBone(stack, bone); RenderUtils.scaleMatrixForBone(stack, bone); RenderUtils.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = player.getSkinTextureLocation(); + ResourceLocation loc = localPlayer.getSkinTextureLocation(); VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); if (name.equals("Lefthand")) { diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/MinigunItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/MinigunItemRenderer.java index 5921a9d6a..92508ccff 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/MinigunItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/MinigunItemRenderer.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.MinigunLayer; import net.mcreator.superbwarfare.client.model.item.MinigunItemModel; +import net.mcreator.superbwarfare.event.ClientEventHandler; import net.mcreator.superbwarfare.item.gun.machinegun.MinigunItem; -import net.mcreator.superbwarfare.client.AnimationHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.model.PlayerModel; import net.minecraft.client.player.AbstractClientPlayer; @@ -77,35 +78,35 @@ public class MinigunItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - Player player_ = Minecraft.getInstance().player; - ItemStack itemStack = null; - if (player_ != null) { - itemStack = player_.getMainHandItem(); - } + Player player = mc.player; + if (player != null) { - if (name.equals("flare")) { - if (itemStack != null && itemStack.getOrCreateTag().getDouble("fire_animation") > 0) { - bone.setHidden(false); - bone.setScaleX((float) (1 + 0.5 * (Math.random() - 0.5))); - bone.setScaleY((float) (1 + 0.5 * (Math.random() - 0.5))); - bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); - } else { - bone.setHidden(true); + ItemStack itemStack = player.getMainHandItem(); + + if (name.equals("flare")) { + if (ClientEventHandler.firePosTimer == 0 || ClientEventHandler.firePosTimer > 0.5) { + bone.setHidden(true); + } else { + bone.setHidden(false); + bone.setScaleX((float) (1 + 0.5 * (Math.random() - 0.5))); + bone.setScaleY((float) (1 + 0.5 * (Math.random() - 0.5))); + bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); + } } - } - if (name.equals("light")) { - bone.setHidden(itemStack == null || !(itemStack.getOrCreateTag().getDouble("fire_animation") > 0)); + if (name.equals("light")) { + bone.setHidden(!(itemStack.getOrCreateTag().getDouble("fire_animation") > 0)); + } } if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer player = mc.player; + AbstractClientPlayer localPlayer = mc.player; - if (player == null) { + if (localPlayer == null) { return; } - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtils.translateMatrixToBone(stack, bone); @@ -113,7 +114,7 @@ public class MinigunItemRenderer extends GeoItemRenderer { RenderUtils.rotateMatrixAroundBone(stack, bone); RenderUtils.scaleMatrixForBone(stack, bone); RenderUtils.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = player.getSkinTextureLocation(); + ResourceLocation loc = localPlayer.getSkinTextureLocation(); VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); if (name.equals("Lefthand")) { 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 6ddc5a1cd..c3d399be8 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 @@ -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.Mk14Layer; import net.mcreator.superbwarfare.client.model.item.Mk14ItemModel; +import net.mcreator.superbwarfare.event.ClientEventHandler; import net.mcreator.superbwarfare.item.gun.rifle.Mk14Item; -import net.mcreator.superbwarfare.client.AnimationHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.model.PlayerModel; import net.minecraft.client.player.AbstractClientPlayer; @@ -79,43 +80,38 @@ public class Mk14ItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - Player player_ = Minecraft.getInstance().player; - ItemStack itemStack = null; - if (player_ != null) { - itemStack = player_.getMainHandItem(); - } + Player player = mc.player; + if (player != null) { + ItemStack itemStack = player.getMainHandItem(); - if (name.equals("flare")) { - if (itemStack != null && itemStack.getOrCreateTag().getDouble("flash_time") > 0) { - bone.setHidden(false); - bone.setScaleX((float) (0.55 + 0.5 * (Math.random() - 0.5))); - bone.setScaleY((float) (0.55 + 0.5 * (Math.random() - 0.5))); - bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); - } else { - bone.setHidden(true); - } - } - - if (name.equals("rex")) { - if (player_ != null) { + if (name.equals("rex")) { bone.setHidden(itemStack.getOrCreateTag().getBoolean("HoloHidden") || GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) != GLFW.GLFW_PRESS); } - } - if (name.equals("jing") || name.equals("qiangguan")) { - if (player_ != null) { + 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); } + + if (name.equals("flare")) { + if (ClientEventHandler.firePosTimer == 0 || ClientEventHandler.firePosTimer > 0.5) { + bone.setHidden(true); + } else { + bone.setHidden(false); + bone.setScaleX((float) (0.75 + 0.5 * (Math.random() - 0.5))); + bone.setScaleY((float) (0.75 + 0.5 * (Math.random() - 0.5))); + bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); + } + } } if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer player = mc.player; + AbstractClientPlayer localPlayer = mc.player; - if (player == null) { + if (localPlayer == null) { return; } - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtils.translateMatrixToBone(stack, bone); @@ -123,7 +119,7 @@ public class Mk14ItemRenderer extends GeoItemRenderer { RenderUtils.rotateMatrixAroundBone(stack, bone); RenderUtils.scaleMatrixForBone(stack, bone); RenderUtils.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = player.getSkinTextureLocation(); + ResourceLocation loc = localPlayer.getSkinTextureLocation(); VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); if (name.equals("Lefthand")) { 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 c945f86a1..079338c84 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 @@ -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.MosinNagantLayer; import net.mcreator.superbwarfare.client.model.item.MosinNagantItemModel; +import net.mcreator.superbwarfare.event.ClientEventHandler; import net.mcreator.superbwarfare.item.gun.sniper.MosinNagantItem; -import net.mcreator.superbwarfare.client.AnimationHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.model.PlayerModel; import net.minecraft.client.player.AbstractClientPlayer; @@ -78,43 +79,38 @@ public class MosinNagantItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - Player player_ = Minecraft.getInstance().player; - ItemStack itemStack = null; - if (player_ != null) { - itemStack = player_.getMainHandItem(); - } + Player player = mc.player; + if (player != null) { + ItemStack itemStack = player.getMainHandItem(); - if (name.equals("flare")) { - if (itemStack != null && itemStack.getOrCreateTag().getDouble("flash_time") > 0) { - bone.setHidden(false); - bone.setScaleX((float) (0.95 + 0.5 * (Math.random() - 0.5))); - bone.setScaleY((float) (0.95 + 0.5 * (Math.random() - 0.5))); - bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); - } else { - bone.setHidden(true); - } - } - - if (name.equals("rex")) { - if (player_ != null) { + if (name.equals("rex")) { bone.setHidden(itemStack.getOrCreateTag().getBoolean("HoloHidden") || GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) != GLFW.GLFW_PRESS); } - } - if (name.equals("jia") || name.equals("b1") || name.equals("b2")) { - if (player_ != null) { + if (name.equals("jia") || name.equals("b1") || name.equals("b2")) { bone.setHidden(!itemStack.getOrCreateTag().getBoolean("HoloHidden")); } + + if (name.equals("flare")) { + if (ClientEventHandler.firePosTimer == 0 || ClientEventHandler.firePosTimer > 0.5) { + bone.setHidden(true); + } else { + bone.setHidden(false); + bone.setScaleX((float) (0.75 + 0.5 * (Math.random() - 0.5))); + bone.setScaleY((float) (0.75 + 0.5 * (Math.random() - 0.5))); + bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); + } + } } if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer player = mc.player; + AbstractClientPlayer localPlayer = mc.player; - if (player == null) { + if (localPlayer == null) { return; } - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtils.translateMatrixToBone(stack, bone); @@ -122,7 +118,7 @@ public class MosinNagantItemRenderer extends GeoItemRenderer { RenderUtils.rotateMatrixAroundBone(stack, bone); RenderUtils.scaleMatrixForBone(stack, bone); RenderUtils.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = player.getSkinTextureLocation(); + ResourceLocation loc = localPlayer.getSkinTextureLocation(); VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); if (name.equals("Lefthand")) { 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 1a786b1fd..fe2afbc55 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 @@ -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.Ntw20Layer; import net.mcreator.superbwarfare.client.model.item.Ntw20Model; +import net.mcreator.superbwarfare.event.ClientEventHandler; import net.mcreator.superbwarfare.item.gun.sniper.Ntw20Item; -import net.mcreator.superbwarfare.client.AnimationHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.model.PlayerModel; import net.minecraft.client.player.AbstractClientPlayer; @@ -79,43 +80,38 @@ public class Ntw20Renderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - Player player_ = Minecraft.getInstance().player; - ItemStack itemStack = null; - if (player_ != null) { - itemStack = player_.getMainHandItem(); - } + Player player = mc.player; + if (player != null) { + ItemStack itemStack = player.getMainHandItem(); - if (name.equals("flare")) { - if (itemStack != null && itemStack.getOrCreateTag().getDouble("flash_time") > 0) { - bone.setHidden(false); - bone.setScaleX((float) (1 + 0.5 * (Math.random() - 0.5))); - bone.setScaleY((float) (1 + 0.5 * (Math.random() - 0.5))); - bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); - } else { - bone.setHidden(true); - } - } - - if (name.equals("rex")) { - if (player_ != null) { + if (name.equals("rex")) { bone.setHidden(itemStack.getOrCreateTag().getBoolean("HoloHidden") || GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) != GLFW.GLFW_PRESS); } - } - if (name.equals("jing") || name.equals("action") || name.equals("body") || name.equals("base")) { - if (player_ != null) { + 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); } + + if (name.equals("flare")) { + if (ClientEventHandler.firePosTimer == 0 || ClientEventHandler.firePosTimer > 0.5) { + bone.setHidden(true); + } else { + bone.setHidden(false); + bone.setScaleX((float) (0.75 + 0.5 * (Math.random() - 0.5))); + bone.setScaleY((float) (0.75 + 0.5 * (Math.random() - 0.5))); + bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); + } + } } if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer player = mc.player; + AbstractClientPlayer localPlayer = mc.player; - if (player == null) { + if (localPlayer == null) { return; } - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtils.translateMatrixToBone(stack, bone); @@ -123,7 +119,7 @@ public class Ntw20Renderer extends GeoItemRenderer { RenderUtils.rotateMatrixAroundBone(stack, bone); RenderUtils.scaleMatrixForBone(stack, bone); RenderUtils.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = player.getSkinTextureLocation(); + ResourceLocation loc = localPlayer.getSkinTextureLocation(); VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); if (name.equals("Lefthand")) { 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 a726f5c05..73063ceb3 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 @@ -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.Qbz95Layer; import net.mcreator.superbwarfare.client.model.item.Qbz95ItemModel; +import net.mcreator.superbwarfare.event.ClientEventHandler; import net.mcreator.superbwarfare.item.gun.rifle.Qbz95Item; -import net.mcreator.superbwarfare.client.AnimationHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.model.PlayerModel; import net.minecraft.client.player.AbstractClientPlayer; @@ -78,42 +79,35 @@ public class Qbz95ItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - if (name.equals("flare")) { - Player player = Minecraft.getInstance().player; - ItemStack itemStack = null; - if (player != null) { - itemStack = player.getMainHandItem(); - } - if (itemStack != null && itemStack.getOrCreateTag().getDouble("flash_time") > 0) { - bone.setHidden(false); - bone.setScaleX((float) (0.55 + 0.5 * (Math.random() - 0.5))); - bone.setScaleY((float) (0.55 + 0.5 * (Math.random() - 0.5))); - bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); - } else { - bone.setHidden(true); - } - } - if (name.equals("holo")) { - Player player = Minecraft.getInstance().player; - ItemStack itemStack = null; - if (player != null) { - itemStack = player.getMainHandItem(); - } - if (player != null) { + Player player = mc.player; + if (player != null) { + 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); } + + if (name.equals("flare")) { + if (ClientEventHandler.firePosTimer == 0 || ClientEventHandler.firePosTimer > 0.5) { + bone.setHidden(true); + } else { + bone.setHidden(false); + bone.setScaleX((float) (0.75 + 0.5 * (Math.random() - 0.5))); + bone.setScaleY((float) (0.75 + 0.5 * (Math.random() - 0.5))); + bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); + } + } } - if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer player = mc.player; + AbstractClientPlayer localPlayer = mc.player; - if (player == null) { + if (localPlayer == null) { return; } - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtils.translateMatrixToBone(stack, bone); @@ -121,7 +115,7 @@ public class Qbz95ItemRenderer extends GeoItemRenderer { RenderUtils.rotateMatrixAroundBone(stack, bone); RenderUtils.scaleMatrixForBone(stack, bone); RenderUtils.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = player.getSkinTextureLocation(); + ResourceLocation loc = localPlayer.getSkinTextureLocation(); VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); if (name.equals("Lefthand")) { diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/RpgItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/RpgItemRenderer.java index ad56503f4..8764854de 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/RpgItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/RpgItemRenderer.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.RpgLayer; import net.mcreator.superbwarfare.client.model.item.RpgItemModel; +import net.mcreator.superbwarfare.event.ClientEventHandler; import net.mcreator.superbwarfare.item.gun.launcher.RpgItem; -import net.mcreator.superbwarfare.client.AnimationHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.model.PlayerModel; import net.minecraft.client.player.AbstractClientPlayer; @@ -77,35 +78,35 @@ public class RpgItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - Player player_ = Minecraft.getInstance().player; - ItemStack itemStack = null; - if (player_ != null) { - itemStack = player_.getMainHandItem(); - } + Player player = mc.player; + if (player != null) { - if (name.equals("flare")) { - if (itemStack != null && itemStack.getOrCreateTag().getDouble("flash_time") > 0) { - bone.setHidden(false); - bone.setScaleX((float) (0.55 + 0.5 * (Math.random() - 0.5))); - bone.setScaleY((float) (0.55 + 0.5 * (Math.random() - 0.5))); - bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); - } else { - bone.setHidden(true); + ItemStack itemStack = player.getMainHandItem(); + + if (name.equals("Rockets")) { + bone.setHidden(itemStack.getOrCreateTag().getBoolean("empty")); } - } - if (name.equals("Rockets")) { - bone.setHidden(itemStack != null && itemStack.getOrCreateTag().getBoolean("empty")); + if (name.equals("flare")) { + if (ClientEventHandler.firePosTimer == 0 || ClientEventHandler.firePosTimer > 0.5) { + bone.setHidden(true); + } else { + bone.setHidden(false); + bone.setScaleX((float) (0.75 + 0.5 * (Math.random() - 0.5))); + bone.setScaleY((float) (0.75 + 0.5 * (Math.random() - 0.5))); + bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); + } + } } if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer player = mc.player; + AbstractClientPlayer localPlayer = mc.player; - if (player == null) { + if (localPlayer == null) { return; } - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtils.translateMatrixToBone(stack, bone); @@ -113,7 +114,7 @@ public class RpgItemRenderer extends GeoItemRenderer { RenderUtils.rotateMatrixAroundBone(stack, bone); RenderUtils.scaleMatrixForBone(stack, bone); RenderUtils.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = player.getSkinTextureLocation(); + ResourceLocation loc = localPlayer.getSkinTextureLocation(); VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); if (name.equals("Lefthand")) { 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 bbd670eea..af30ad1ed 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 @@ -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.RpkLayer; import net.mcreator.superbwarfare.client.model.item.RpkItemModel; +import net.mcreator.superbwarfare.event.ClientEventHandler; import net.mcreator.superbwarfare.item.gun.machinegun.RpkItem; -import net.mcreator.superbwarfare.client.AnimationHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.model.PlayerModel; import net.minecraft.client.player.AbstractClientPlayer; @@ -78,42 +79,34 @@ public class RpkItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - if (name.equals("flare")) { - Player player = Minecraft.getInstance().player; - ItemStack itemStack = null; - if (player != null) { - itemStack = player.getMainHandItem(); - } - if (itemStack != null && itemStack.getOrCreateTag().getDouble("flash_time") > 0) { - bone.setHidden(false); - bone.setScaleX((float) (0.55 + 0.5 * (Math.random() - 0.5))); - bone.setScaleY((float) (0.55 + 0.5 * (Math.random() - 0.5))); - bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); - } else { - bone.setHidden(true); - } - } + Player player = mc.player; + if (player != null) { + ItemStack itemStack = player.getMainHandItem(); - if (name.equals("holo")) { - Player player = Minecraft.getInstance().player; - ItemStack itemStack = null; - if (player != null) { - itemStack = player.getMainHandItem(); - } - if (player != null) { + if (name.equals("holo")) { 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 (ClientEventHandler.firePosTimer == 0 || ClientEventHandler.firePosTimer > 0.5) { + bone.setHidden(true); + } else { + bone.setHidden(false); + bone.setScaleX((float) (0.75 + 0.5 * (Math.random() - 0.5))); + bone.setScaleY((float) (0.75 + 0.5 * (Math.random() - 0.5))); + bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); + } + } } - if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer player = mc.player; + AbstractClientPlayer localPlayer = mc.player; - if (player == null) { + if (localPlayer == null) { return; } - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtils.translateMatrixToBone(stack, bone); @@ -121,7 +114,7 @@ public class RpkItemRenderer extends GeoItemRenderer { RenderUtils.rotateMatrixAroundBone(stack, bone); RenderUtils.scaleMatrixForBone(stack, bone); RenderUtils.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = player.getSkinTextureLocation(); + ResourceLocation loc = localPlayer.getSkinTextureLocation(); VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); if (name.equals("Lefthand")) { 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 e287ab43a..a197e1bcb 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 @@ -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.SentinelLayer; import net.mcreator.superbwarfare.client.model.item.SentinelItemModel; +import net.mcreator.superbwarfare.event.ClientEventHandler; import net.mcreator.superbwarfare.item.gun.sniper.SentinelItem; -import net.mcreator.superbwarfare.client.AnimationHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.model.PlayerModel; import net.minecraft.client.player.AbstractClientPlayer; @@ -80,50 +81,44 @@ public class SentinelItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - Player player_ = Minecraft.getInstance().player; - ItemStack itemStack = null; - if (player_ != null) { - itemStack = player_.getMainHandItem(); - } - if (name.equals("flare")) { - if (itemStack != null && itemStack.getOrCreateTag().getDouble("flash_time") > 0) { - bone.setHidden(false); - bone.setScaleX((float) (0.55 + 0.5 * (Math.random() - 0.5))); - bone.setScaleY((float) (0.55 + 0.5 * (Math.random() - 0.5))); - bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); - } else { - bone.setHidden(true); + Player player = mc.player; + if (player != null) { + ItemStack itemStack = player.getMainHandItem(); + + if (name.equals("flare")) { + if (ClientEventHandler.firePosTimer == 0 || ClientEventHandler.firePosTimer > 0.5) { + bone.setHidden(true); + } else { + bone.setHidden(false); + bone.setScaleX((float) (0.75 + 0.5 * (Math.random() - 0.5))); + bone.setScaleY((float) (0.75 + 0.5 * (Math.random() - 0.5))); + bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); + } } - } - if (name.equals("holo")) { - if (player_ != null) { + if (name.equals("holo")) { bone.setHidden(itemStack.getOrCreateTag().getBoolean("HoloHidden") || GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) != GLFW.GLFW_PRESS); } - } - AtomicBoolean flag = new AtomicBoolean(false); - if (itemStack != null) { + AtomicBoolean flag = new AtomicBoolean(false); itemStack.getCapability(ForgeCapabilities.ENERGY).ifPresent( iEnergyStorage -> flag.set(iEnergyStorage.getEnergyStored() > 0) ); - } - if (name.equals("charge")) { - if (player_ != null) { + if (name.equals("charge")) { bone.setHidden(!flag.get()); } } if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer player = mc.player; + AbstractClientPlayer localPlayer = mc.player; - if (player == null) { + if (localPlayer == null) { return; } - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtils.translateMatrixToBone(stack, bone); @@ -131,7 +126,7 @@ public class SentinelItemRenderer extends GeoItemRenderer { RenderUtils.rotateMatrixAroundBone(stack, bone); RenderUtils.scaleMatrixForBone(stack, bone); RenderUtils.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = player.getSkinTextureLocation(); + ResourceLocation loc = localPlayer.getSkinTextureLocation(); VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); if (name.equals("Lefthand")) { 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 fa8698c64..89c721bbf 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 @@ -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.SksLayer; import net.mcreator.superbwarfare.client.model.item.SksItemModel; +import net.mcreator.superbwarfare.event.ClientEventHandler; import net.mcreator.superbwarfare.item.gun.rifle.SksItem; -import net.mcreator.superbwarfare.client.AnimationHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.model.PlayerModel; import net.minecraft.client.player.AbstractClientPlayer; @@ -78,42 +79,34 @@ public class SksItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - if (name.equals("flare")) { - Player player = Minecraft.getInstance().player; - ItemStack itemStack = null; - if (player != null) { - itemStack = player.getMainHandItem(); - } - if (itemStack != null && itemStack.getOrCreateTag().getDouble("flash_time") > 0) { - bone.setHidden(false); - bone.setScaleX((float) (0.55 + 0.5 * (Math.random() - 0.5))); - bone.setScaleY((float) (0.55 + 0.5 * (Math.random() - 0.5))); - bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); - } else { - bone.setHidden(true); - } - } + Player player = mc.player; + if (player != null) { + ItemStack itemStack = player.getMainHandItem(); - if (name.equals("holo")) { - Player player = Minecraft.getInstance().player; - ItemStack itemStack = null; - if (player != null) { - itemStack = player.getMainHandItem(); - } - if (player != null) { + if (name.equals("holo")) { 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 (ClientEventHandler.firePosTimer == 0 || ClientEventHandler.firePosTimer > 0.5) { + bone.setHidden(true); + } else { + bone.setHidden(false); + bone.setScaleX((float) (0.75 + 0.5 * (Math.random() - 0.5))); + bone.setScaleY((float) (0.75 + 0.5 * (Math.random() - 0.5))); + bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); + } + } } - if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer player = mc.player; + AbstractClientPlayer localPlayer = mc.player; - if (player == null) { + if (localPlayer == null) { return; } - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtils.translateMatrixToBone(stack, bone); @@ -121,7 +114,7 @@ public class SksItemRenderer extends GeoItemRenderer { RenderUtils.rotateMatrixAroundBone(stack, bone); RenderUtils.scaleMatrixForBone(stack, bone); RenderUtils.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = player.getSkinTextureLocation(); + ResourceLocation loc = localPlayer.getSkinTextureLocation(); VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); if (name.equals("Lefthand")) { 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 ab5fe109d..1d83c53e3 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 @@ -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.SvdLayer; import net.mcreator.superbwarfare.client.model.item.SvdItemModel; +import net.mcreator.superbwarfare.event.ClientEventHandler; import net.mcreator.superbwarfare.item.gun.sniper.SvdItem; -import net.mcreator.superbwarfare.client.AnimationHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.model.PlayerModel; import net.minecraft.client.player.AbstractClientPlayer; @@ -79,47 +80,46 @@ public class SvdItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - Player player_ = Minecraft.getInstance().player; - ItemStack itemStack = null; - if (player_ != null) { - itemStack = player_.getMainHandItem(); - } + Player player = mc.player; + if (player != null) { + ItemStack itemStack = player.getMainHandItem(); - if (name.equals("flare")) { - if (itemStack != null && itemStack.getOrCreateTag().getDouble("flash_time") > 0) { - bone.setHidden(false); - bone.setScaleX((float) (0.55 + 0.5 * (Math.random() - 0.5))); - bone.setScaleY((float) (0.55 + 0.5 * (Math.random() - 0.5))); - bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); - } else { - bone.setHidden(true); - } - } - - if (name.equals("holo")) { - if (player_ != null) { + if (name.equals("holo")) { bone.setHidden(itemStack.getOrCreateTag().getBoolean("HoloHidden") || GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) != GLFW.GLFW_PRESS); } - } - if (name.equals("glass")) { - bone.setHidden(true); - } + if (name.equals("glass")) { + bone.setHidden(true); + } - if (name.equals("handguard")) { - if (player_ != null) { + if (name.equals("handguard")) { bone.setHidden(!itemStack.getOrCreateTag().getBoolean("HoloHidden") && GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS); } + + if (name.equals("holo")) { + 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 (ClientEventHandler.firePosTimer == 0 || ClientEventHandler.firePosTimer > 0.5) { + bone.setHidden(true); + } else { + bone.setHidden(false); + bone.setScaleX((float) (0.75 + 0.5 * (Math.random() - 0.5))); + bone.setScaleY((float) (0.75 + 0.5 * (Math.random() - 0.5))); + bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); + } + } } if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer player = mc.player; + AbstractClientPlayer localPlayer = mc.player; - if (player == null) { + if (localPlayer == null) { return; } - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtils.translateMatrixToBone(stack, bone); @@ -127,7 +127,7 @@ public class SvdItemRenderer extends GeoItemRenderer { RenderUtils.rotateMatrixAroundBone(stack, bone); RenderUtils.scaleMatrixForBone(stack, bone); RenderUtils.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = player.getSkinTextureLocation(); + ResourceLocation loc = localPlayer.getSkinTextureLocation(); VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); if (name.equals("Lefthand")) { diff --git a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/TracheliumItemRenderer.java b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/TracheliumItemRenderer.java index f0e3013cb..3ce9d3338 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/renderer/item/TracheliumItemRenderer.java +++ b/src/main/java/net/mcreator/superbwarfare/client/renderer/item/TracheliumItemRenderer.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.TracheliumLayer; import net.mcreator.superbwarfare.client.model.item.TracheliumItemModel; +import net.mcreator.superbwarfare.event.ClientEventHandler; import net.mcreator.superbwarfare.item.gun.handgun.Trachelium; -import net.mcreator.superbwarfare.client.AnimationHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.model.PlayerModel; import net.minecraft.client.player.AbstractClientPlayer; @@ -77,30 +78,29 @@ public class TracheliumItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - if (name.equals("flare")) { - Player player = Minecraft.getInstance().player; - ItemStack itemStack = null; - if (player != null) { - itemStack = player.getMainHandItem(); - } - if (itemStack != null && itemStack.getOrCreateTag().getDouble("flash_time") > 0) { - bone.setHidden(false); - bone.setScaleX((float) (0.55 + 0.5 * (Math.random() - 0.5))); - bone.setScaleY((float) (0.55 + 0.5 * (Math.random() - 0.5))); - bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); - } else { - bone.setHidden(true); + Player player = mc.player; + if (player != null) { + + if (name.equals("flare")) { + if (ClientEventHandler.firePosTimer == 0 || ClientEventHandler.firePosTimer > 0.5) { + bone.setHidden(true); + } else { + bone.setHidden(false); + bone.setScaleX((float) (0.75 + 0.5 * (Math.random() - 0.5))); + bone.setScaleY((float) (0.75 + 0.5 * (Math.random() - 0.5))); + bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); + } } } if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer player = mc.player; + AbstractClientPlayer localPlayer = mc.player; - if (player == null) { + if (localPlayer == null) { return; } - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtils.translateMatrixToBone(stack, bone); @@ -108,7 +108,7 @@ public class TracheliumItemRenderer extends GeoItemRenderer { RenderUtils.rotateMatrixAroundBone(stack, bone); RenderUtils.scaleMatrixForBone(stack, bone); RenderUtils.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = player.getSkinTextureLocation(); + ResourceLocation loc = localPlayer.getSkinTextureLocation(); VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); if (name.equals("Lefthand")) { 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 c8f4f47e8..0539956c3 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 @@ -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.VectorLayer; import net.mcreator.superbwarfare.client.model.item.VectorItemModel; +import net.mcreator.superbwarfare.event.ClientEventHandler; import net.mcreator.superbwarfare.item.gun.smg.VectorItem; -import net.mcreator.superbwarfare.client.AnimationHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.model.PlayerModel; import net.minecraft.client.player.AbstractClientPlayer; @@ -78,26 +79,34 @@ public class VectorItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - if (name.equals("holo")) { - Player player = Minecraft.getInstance().player; - ItemStack itemStack = null; - if (player != null) { - itemStack = player.getMainHandItem(); - } - if (player != null) { + Player player = mc.player; + if (player != null) { + 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); } + + if (name.equals("flare")) { + if (ClientEventHandler.firePosTimer == 0 || ClientEventHandler.firePosTimer > 0.5) { + bone.setHidden(true); + } else { + bone.setHidden(false); + bone.setScaleX((float) (0.75 + 0.5 * (Math.random() - 0.5))); + bone.setScaleY((float) (0.75 + 0.5 * (Math.random() - 0.5))); + bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); + } + } } - if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer player = mc.player; + AbstractClientPlayer localPlayer = mc.player; - if (player == null) { + if (localPlayer == null) { return; } - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtils.translateMatrixToBone(stack, bone); @@ -105,7 +114,7 @@ public class VectorItemRenderer extends GeoItemRenderer { RenderUtils.rotateMatrixAroundBone(stack, bone); RenderUtils.scaleMatrixForBone(stack, bone); RenderUtils.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = player.getSkinTextureLocation(); + ResourceLocation loc = localPlayer.getSkinTextureLocation(); VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); if (name.equals("Lefthand")) { diff --git a/src/main/java/net/mcreator/superbwarfare/event/PlayerEventHandler.java b/src/main/java/net/mcreator/superbwarfare/event/PlayerEventHandler.java index fb5c1ef1a..af81a3f45 100644 --- a/src/main/java/net/mcreator/superbwarfare/event/PlayerEventHandler.java +++ b/src/main/java/net/mcreator/superbwarfare/event/PlayerEventHandler.java @@ -190,7 +190,7 @@ public class PlayerEventHandler { * 判断玩家是否在奔跑 */ private static void handlePlayerSprint(Player player) { - if (player.getMainHandItem().getOrCreateTag().getInt("flash_time") > 0 || player.getMainHandItem().getOrCreateTag().getInt("fire_animation") > 0) { + if (player.getMainHandItem().getOrCreateTag().getInt("fire_animation") > 0) { player.getPersistentData().putDouble("noRun", 10); } diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/GunItem.java b/src/main/java/net/mcreator/superbwarfare/item/gun/GunItem.java index 1a1cac5fb..95bec9f38 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/GunItem.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/GunItem.java @@ -69,10 +69,6 @@ public abstract class GunItem extends Item { itemstack.getOrCreateTag().putInt("fire_animation", (itemstack.getOrCreateTag().getInt("fire_animation") - 1)); } - if (itemstack.getOrCreateTag().getDouble("flash_time") > 0) { - itemstack.getOrCreateTag().putDouble("flash_time", (itemstack.getOrCreateTag().getDouble("flash_time") - 1)); - } - handleGunPerks(itemstack); handleGunAttachment(itemstack); diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/MarlinItem.java b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/MarlinItem.java index 5253945da..c809c5afa 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/MarlinItem.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/MarlinItem.java @@ -1,6 +1,7 @@ package net.mcreator.superbwarfare.item.gun.rifle; import net.mcreator.superbwarfare.ModUtils; +import net.mcreator.superbwarfare.client.PoseTool; import net.mcreator.superbwarfare.client.renderer.item.MarlinItemRenderer; import net.mcreator.superbwarfare.event.ClientEventHandler; import net.mcreator.superbwarfare.init.ModItems; @@ -11,7 +12,6 @@ import net.mcreator.superbwarfare.item.gun.GunItem; import net.mcreator.superbwarfare.perk.Perk; import net.mcreator.superbwarfare.perk.PerkHelper; import net.mcreator.superbwarfare.tools.GunsTool; -import net.mcreator.superbwarfare.client.PoseTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.LocalPlayer; @@ -77,14 +77,6 @@ public class MarlinItem extends GunItem implements GeoItem, AnimatedItem { if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP; if (transformType != null && transformType.firstPerson()) { - if (stack.getOrCreateTag().getInt("flash_time") > 0) { - return event.setAndContinue(RawAnimation.begin().thenPlay("animation.marlin.fire")); - } - - if (stack.getOrCreateTag().getInt("flash_time") > 0) { - return event.setAndContinue(RawAnimation.begin().thenPlay("animation.marlin.fire2")); - } - if (stack.getOrCreateTag().getDouble("marlin_animation_time") > 0 && !stack.getOrCreateTag().getBoolean("fastfiring")) { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.marlin.shift")); } diff --git a/src/main/java/net/mcreator/superbwarfare/network/message/ShootMessage.java b/src/main/java/net/mcreator/superbwarfare/network/message/ShootMessage.java index 576e57b1d..5fb03fe8c 100644 --- a/src/main/java/net/mcreator/superbwarfare/network/message/ShootMessage.java +++ b/src/main/java/net/mcreator/superbwarfare/network/message/ShootMessage.java @@ -100,7 +100,6 @@ public class ShootMessage { stack.getOrCreateTag().putInt("ammo", (stack.getOrCreateTag().getInt("ammo") - 1)); stack.getOrCreateTag().putInt("fire_animation", coolDownTick); - stack.getOrCreateTag().putDouble("flash_time", 2); stack.getOrCreateTag().putDouble("empty", 1); diff --git a/src/main/resources/assets/superbwarfare/animations/ak.animation.json b/src/main/resources/assets/superbwarfare/animations/ak.animation.json index e819869ef..712001a18 100644 --- a/src/main/resources/assets/superbwarfare/animations/ak.animation.json +++ b/src/main/resources/assets/superbwarfare/animations/ak.animation.json @@ -236,10 +236,6 @@ } } }, - "animation.ak47.fire": { - "animation_length": 0.05, - "override_previous_animation": true - }, "animation.ak47.reload_normal": { "loop": "hold_on_last_frame", "animation_length": 2.4833, @@ -1404,78 +1400,6 @@ } } }, - "camera": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.3": { - "vector": [0, 0, 1.5], - "easing": "easeInElastic" - }, - "0.4167": { - "vector": [0, 0, 1] - }, - "0.65": { - "vector": [0.5, 0, 1.2], - "easing": "easeOutSine" - }, - "0.7667": { - "vector": [-0.1, 0, 2] - }, - "0.8833": { - "vector": [0, 0, 1.5], - "easing": "easeInElastic" - }, - "0.9667": { - "vector": [1, 1, -2.5], - "easing": "easeInSine" - }, - "1.05": { - "vector": [-0.5, -0.5, 1.5] - }, - "1.3": { - "vector": [0.5, 0, 1], - "easing": "easeInElastic" - }, - "1.4667": { - "vector": [-0.5, 0, 2.2], - "easing": "linear" - }, - "1.55": { - "vector": [1.5, -0.7, 0.8], - "easing": "easeInSine" - }, - "2.0167": { - "vector": [0, 0, 1.5], - "easing": "linear" - }, - "2.15": { - "vector": [0.2, 0, 1.5] - }, - "2.25": { - "vector": [1, 2, 1.8] - }, - "2.3167": { - "vector": [-1.5, -3, -1.5] - }, - "2.45": { - "vector": [0.2, 1.5, 1.5] - }, - "2.6": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - }, - "2.9667": { - "vector": [0, 0, -0.75], - "easing": "linear" - }, - "3.1333": { - "vector": [0, 0, 0], - "easing": "linear" - } - } - }, "bolt": { "position": { "2.25": { @@ -1682,13 +1606,16 @@ "2.0333": { "vector": [-63.28453, -32.24133, 119.67539] }, - "2.1667": { - "vector": [-55.8055, -45.03766, 136.04839] + "2.15": { + "vector": [-54.27606, -45.56562, 134.31729] }, - "2.25": { - "vector": [-56.50998, -68.03459, 136.84785] + "2.2167": { + "vector": [-54.27606, -45.56562, 134.31729] }, - "2.3833": { + "2.3667": { + "vector": [-58.29576, -75.03148, 137.66094] + }, + "2.4": { "vector": [-58.29576, -75.03148, 137.66094] }, "2.6333": { @@ -1769,14 +1696,17 @@ "2.0667": { "vector": [-10.24667, 0.18654, 1.6813] }, - "2.1667": { - "vector": [-10.06869, 1.26782, 1.97612] + "2.15": { + "vector": [-10.04608, -0.32088, 4.27925] }, - "2.25": { - "vector": [-10.24667, -1.41346, 1.5813] + "2.2167": { + "vector": [-10.04608, -0.32088, 4.27925] }, - "2.3833": { - "vector": [-10.24667, -1.41346, 3.1813] + "2.3667": { + "vector": [-10.36244, -2.58271, 3.4251] + }, + "2.4": { + "vector": [-10.36244, -2.58271, 3.4251] }, "2.4833": { "vector": [-15.39165, -0.47556, 13.67161] @@ -1788,6 +1718,78 @@ "vector": [0, 0, 0] } } + }, + "camera": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.3": { + "vector": [0, 0, 1.5], + "easing": "easeInElastic" + }, + "0.4167": { + "vector": [0, 0, 1] + }, + "0.65": { + "vector": [0.5, 0, 1.2], + "easing": "easeOutSine" + }, + "0.7667": { + "vector": [-0.1, 0, 2] + }, + "0.8833": { + "vector": [0, 0, 1.5], + "easing": "easeInElastic" + }, + "0.9667": { + "vector": [1, 1, -2.5], + "easing": "easeInSine" + }, + "1.05": { + "vector": [-0.5, -0.5, 1.5] + }, + "1.3": { + "vector": [0.5, 0, 1], + "easing": "easeInElastic" + }, + "1.4667": { + "vector": [-0.5, 0, 2.2], + "easing": "linear" + }, + "1.55": { + "vector": [1.5, -0.7, 0.8], + "easing": "easeInSine" + }, + "2.0167": { + "vector": [0, 0, 1.5], + "easing": "linear" + }, + "2.15": { + "vector": [0.2, 0, 1.5] + }, + "2.25": { + "vector": [1, 2, 1.8] + }, + "2.3167": { + "vector": [-1.5, -3, -1.5] + }, + "2.45": { + "vector": [0.2, 1.5, 1.5] + }, + "2.6": { + "vector": [0, 0, 0], + "easing": "easeInElastic" + }, + "2.9667": { + "vector": [0, 0, -0.75], + "easing": "linear" + }, + "3.1333": { + "vector": [0, 0, 0], + "easing": "linear" + } + } } }, "sound_effects": { diff --git a/src/main/resources/assets/superbwarfare/geo/hk416.geo.json b/src/main/resources/assets/superbwarfare/geo/hk416.geo.json index 48a1b1f4b..6ff9a2cf7 100644 --- a/src/main/resources/assets/superbwarfare/geo/hk416.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/hk416.geo.json @@ -825,11 +825,11 @@ { "name": "Grip1", "parent": "0", - "pivot": [0, -0.77813, -10.21739], + "pivot": [0, -0.77813, -10.96739], "rotation": [-1, 0, 0], "cubes": [ { - "origin": [-0.41333, 0.31981, -11.14847], + "origin": [-0.41333, 0.31981, -11.89847], "size": [0.82667, 0.41865, 1.86], "uv": { "north": {"uv": [81.5, 49], "uv_size": [0.5, 0.25]}, @@ -838,9 +838,9 @@ } }, { - "origin": [-0.60227, 0.31981, -11.10567], + "origin": [-0.60227, 0.31981, -11.85567], "size": [0.29227, 0.41865, 0.20667], - "pivot": [-0.41333, 0.44897, -11.00234], + "pivot": [-0.41333, 0.44897, -11.75234], "rotation": [0, 45, 0], "uv": { "north": {"uv": [81, 50], "uv_size": [0.25, 0.25]}, @@ -849,9 +849,9 @@ } }, { - "origin": [0.31, 0.31981, -11.10567], + "origin": [0.31, 0.31981, -11.85567], "size": [0.29227, 0.41865, 0.20667], - "pivot": [0.41333, 0.44897, -11.00234], + "pivot": [0.41333, 0.44897, -11.75234], "rotation": [0, -45, 0], "uv": { "north": {"uv": [83, 48.5], "uv_size": [0.25, 0.25]}, @@ -860,9 +860,9 @@ } }, { - "origin": [-0.41701, 0.31981, -9.92468], + "origin": [-0.41701, 0.31981, -10.67468], "size": [0.20667, 0.41865, 0.29228], - "pivot": [0, 0.44897, -9.46487], + "pivot": [0, 0.44897, -10.21487], "rotation": [0, 45, 0], "uv": { "east": {"uv": [82.5, 50], "uv_size": [0.25, 0.25]}, @@ -871,9 +871,9 @@ } }, { - "origin": [0.16754, 0.31981, -9.25454], + "origin": [0.16754, 0.31981, -10.00454], "size": [0.29227, 0.41865, 0.20667], - "pivot": [0, 0.44897, -9.46487], + "pivot": [0, 0.44897, -10.21487], "rotation": [0, 45, 0], "uv": { "south": {"uv": [79, 50.5], "uv_size": [0.25, 0.25]}, @@ -882,7 +882,7 @@ } }, { - "origin": [-0.62, 0.31981, -10.94181], + "origin": [-0.62, 0.31981, -11.69181], "size": [1.24, 0.41865, 1.44667], "uv": { "east": {"uv": [79.5, 48.5], "uv_size": [0.75, 0.25]}, @@ -892,9 +892,9 @@ } }, { - "origin": [-0.65375, 0.39805, -10.31453], + "origin": [-0.65375, 0.39805, -11.06453], "size": [1.3075, 0.25313, 0.25313], - "pivot": [0, 0.52461, -10.18797], + "pivot": [0, 0.52461, -10.93797], "rotation": [-45, 0, 0], "uv": { "east": {"uv": [83.5, 48.5], "uv_size": [0.25, 0.25]}, @@ -904,7 +904,7 @@ } }, { - "origin": [-0.41333, 0.11314, -10.94181], + "origin": [-0.41333, 0.11314, -11.69181], "size": [0.82667, 0.20667, 1.44667], "uv": { "east": {"uv": [81.5, 48], "uv_size": [0.75, 0.25]}, @@ -913,9 +913,9 @@ } }, { - "origin": [0.50666, 0.75683, -10.94181], + "origin": [0.50666, 0.75683, -11.69181], "size": [0.29761, 0.29476, 1.44667], - "pivot": [-0.17121, 0.90812, -9.49514], + "pivot": [-0.17121, 0.90812, -10.24514], "rotation": [0, 0, 45], "uv": { "north": {"uv": [83.5, 46.5], "uv_size": [0.25, 0.25]}, @@ -925,9 +925,9 @@ } }, { - "origin": [-0.80426, 0.75683, -10.94181], + "origin": [-0.80426, 0.75683, -11.69181], "size": [0.29761, 0.29476, 1.44667], - "pivot": [0.17121, 0.90812, -9.49514], + "pivot": [0.17121, 0.90812, -10.24514], "rotation": [0, 0, -45], "uv": { "north": {"uv": [83.5, 48], "uv_size": [0.25, 0.25]}, @@ -937,9 +937,9 @@ } }, { - "origin": [-0.41333, 0.13357, -9.54446], + "origin": [-0.41333, 0.13357, -10.29446], "size": [0.82667, 0.29227, 0.18084], - "pivot": [0, 0.28211, -9.45404], + "pivot": [0, 0.28211, -10.20404], "rotation": [-45, 0, 0], "uv": { "east": {"uv": [83.5, 47], "uv_size": [0.25, 0.25]}, @@ -948,9 +948,9 @@ } }, { - "origin": [-0.41333, 0.43623, -10.34265], + "origin": [-0.41333, 0.43623, -11.09265], "size": [0.82667, 0.29227, 0.18083], - "pivot": [0, -0.44857, -10.25223], + "pivot": [0, -0.44857, -11.00223], "rotation": [45, 0, 0], "uv": { "north": {"uv": [80.5, 49.5], "uv_size": [0.5, 0.25]}, @@ -963,10 +963,10 @@ { "name": "bone38", "parent": "Grip1", - "pivot": [0, -1.83809, -10.21784], + "pivot": [0, -1.83809, -10.96784], "cubes": [ { - "origin": [-0.21973, -2.94492, -10.75001], + "origin": [-0.21973, -2.94492, -11.50001], "size": [0.43947, 3.21366, 1.06433], "uv": { "north": {"uv": [79.5, 47], "uv_size": [0.25, 1.5]}, @@ -976,9 +976,9 @@ } }, { - "origin": [-0.21973, -2.94492, -10.75001], + "origin": [-0.21973, -2.94492, -11.50001], "size": [0.43947, 3.21366, 1.06433], - "pivot": [0, -1.9877, -10.21784], + "pivot": [0, -1.9877, -10.96784], "rotation": [0, -45, 0], "uv": { "north": {"uv": [80.5, 46], "uv_size": [0.25, 1.5]}, @@ -988,9 +988,9 @@ } }, { - "origin": [-0.21973, -2.94492, -10.75001], + "origin": [-0.21973, -2.94492, -11.50001], "size": [0.43947, 3.21366, 1.06433], - "pivot": [0, -1.9877, -10.21784], + "pivot": [0, -1.9877, -10.96784], "rotation": [0, -90, 0], "uv": { "north": {"uv": [79, 48], "uv_size": [0.25, 1.5]}, @@ -1000,9 +1000,9 @@ } }, { - "origin": [-0.21973, -2.94492, -10.75001], + "origin": [-0.21973, -2.94492, -11.50001], "size": [0.43947, 3.21366, 1.06433], - "pivot": [0, -1.9877, -10.21784], + "pivot": [0, -1.9877, -10.96784], "rotation": [-180, -45, 180], "uv": { "north": {"uv": [81, 47.5], "uv_size": [0.25, 1.5]}, @@ -1016,10 +1016,10 @@ { "name": "bone39", "parent": "Grip1", - "pivot": [0, -1.27373, -10.22293], + "pivot": [0, -1.27373, -10.97293], "cubes": [ { - "origin": [-0.19776, -3.44488, -10.70188], + "origin": [-0.19776, -3.44488, -11.45188], "size": [0.39552, 0.5, 0.9579], "uv": { "north": {"uv": [83.5, 49], "uv_size": [0.25, 0.25]}, @@ -1029,9 +1029,9 @@ } }, { - "origin": [-0.19776, -3.44488, -10.70188], + "origin": [-0.19776, -3.44488, -11.45188], "size": [0.39552, 0.5, 0.9579], - "pivot": [0, -1.40838, -10.22293], + "pivot": [0, -1.40838, -10.97293], "rotation": [0, -45, 0], "uv": { "north": {"uv": [83.5, 49.5], "uv_size": [0.25, 0.25]}, @@ -1041,9 +1041,9 @@ } }, { - "origin": [-0.19776, -3.44488, -10.70188], + "origin": [-0.19776, -3.44488, -11.45188], "size": [0.39552, 0.5, 0.9579], - "pivot": [0, -1.40838, -10.22293], + "pivot": [0, -1.40838, -10.97293], "rotation": [0, -90, 0], "uv": { "north": {"uv": [83.5, 50], "uv_size": [0.25, 0.25]}, @@ -1053,9 +1053,9 @@ } }, { - "origin": [-0.19776, -3.44488, -10.70188], + "origin": [-0.19776, -3.44488, -11.45188], "size": [0.39552, 0.5, 0.9579], - "pivot": [0, -1.40838, -10.22293], + "pivot": [0, -1.40838, -10.97293], "rotation": [-180, -45, 180], "uv": { "north": {"uv": [79, 51], "uv_size": [0.25, 0.25]}, @@ -1069,10 +1069,10 @@ { "name": "Grip2", "parent": "0", - "pivot": [0, 0.41078, -11.25328], + "pivot": [0, 0.41078, -12.25328], "cubes": [ { - "origin": [-0.62, 0.40809, -12.79181], + "origin": [-0.62, 0.40809, -13.79181], "size": [1.24, 0.31865, 5.44667], "uv": { "north": {"uv": [84, 54], "uv_size": [0.5, 0.25]}, @@ -1083,7 +1083,7 @@ } }, { - "origin": [0.48, 0.72673, -12.54181], + "origin": [0.48, 0.72673, -13.54181], "size": [0.14, 0.25, 1.69667], "uv": { "north": {"uv": [82.5, 57.5], "uv_size": [0.25, 0.25]}, @@ -1093,9 +1093,9 @@ } }, { - "origin": [0.48, 0.25681, -11.03804], + "origin": [0.48, 0.25681, -12.03804], "size": [0.14, 0.25, 0.52089], - "pivot": [0.55, 0.38181, -10.06471], + "pivot": [0.55, 0.38181, -11.06471], "rotation": [-30, 0, 0], "uv": { "east": {"uv": [84.5, 55.5], "uv_size": [0.25, 0.25]}, @@ -1104,7 +1104,7 @@ } }, { - "origin": [-0.62, 0.72673, -12.54181], + "origin": [-0.62, 0.72673, -13.54181], "size": [0.14, 0.25, 1.69667], "uv": { "north": {"uv": [84.5, 57], "uv_size": [0.25, 0.25]}, @@ -1114,9 +1114,9 @@ } }, { - "origin": [-0.62, 0.25681, -11.03804], + "origin": [-0.62, 0.25681, -12.03804], "size": [0.14, 0.25, 0.52089], - "pivot": [-0.55, 0.38181, -10.06471], + "pivot": [-0.55, 0.38181, -11.06471], "rotation": [-30, 0, 0], "uv": { "east": {"uv": [83.5, 57.5], "uv_size": [0.25, 0.25]}, @@ -1125,9 +1125,9 @@ } }, { - "origin": [0.48, 0.12509, -12.51969], + "origin": [0.48, 0.12509, -13.51969], "size": [0.14, 0.2, 0.35136], - "pivot": [0.55, 0.20009, -13.14167], + "pivot": [0.55, 0.20009, -14.14167], "rotation": [45, 0, 0], "uv": { "east": {"uv": [85.5, 53], "uv_size": [0.25, 0.25]}, @@ -1136,9 +1136,9 @@ } }, { - "origin": [-0.62, 0.12509, -12.51969], + "origin": [-0.62, 0.12509, -13.51969], "size": [0.14, 0.2, 0.35136], - "pivot": [-0.55, 0.20009, -13.14167], + "pivot": [-0.55, 0.20009, -14.14167], "rotation": [45, 0, 0], "uv": { "east": {"uv": [79.5, 58.5], "uv_size": [0.25, 0.25]}, @@ -1147,7 +1147,7 @@ } }, { - "origin": [-0.41333, 0.20142, -12.79181], + "origin": [-0.41333, 0.20142, -13.79181], "size": [0.82667, 0.20667, 5.44667], "uv": { "north": {"uv": [84, 55], "uv_size": [0.5, 0.25]}, @@ -1158,9 +1158,9 @@ } }, { - "origin": [0.50666, 0.84511, -12.79181], + "origin": [0.50666, 0.84511, -13.79181], "size": [0.29761, 0.29476, 5.44667], - "pivot": [-0.17121, 0.9964, -9.34514], + "pivot": [-0.17121, 0.9964, -10.34514], "rotation": [0, 0, 45], "uv": { "north": {"uv": [84.5, 53.5], "uv_size": [0.25, 0.25]}, @@ -1170,9 +1170,9 @@ } }, { - "origin": [-0.80426, 0.84511, -12.79181], + "origin": [-0.80426, 0.84511, -13.79181], "size": [0.29761, 0.29476, 5.44667], - "pivot": [0.17121, 0.99641, -9.34514], + "pivot": [0.17121, 0.99641, -10.34514], "rotation": [0, 0, -45], "uv": { "north": {"uv": [82, 57.5], "uv_size": [0.25, 0.25]}, @@ -1182,9 +1182,9 @@ } }, { - "origin": [-0.36333, -0.28087, -12.76835], + "origin": [-0.36333, -0.28087, -13.76835], "size": [0.72667, 0.51, 0.21], - "pivot": [0.05, 0.07413, -12.61335], + "pivot": [0.05, 0.07413, -13.61335], "rotation": [9.5, 0, 0], "uv": { "north": {"uv": [84.5, 54], "uv_size": [0.25, 0.25]}, @@ -1193,9 +1193,9 @@ } }, { - "origin": [-0.36333, -0.27218, -12.61214], + "origin": [-0.36333, -0.27218, -13.61214], "size": [0.72667, 0.52563, 0.22172], - "pivot": [0.05, 0.08282, -12.54542], + "pivot": [0.05, 0.08282, -13.54542], "rotation": [-16.5, 0, 0], "uv": { "east": {"uv": [79.5, 58], "uv_size": [0.25, 0.25]}, @@ -1204,7 +1204,7 @@ } }, { - "origin": [-0.36333, -0.30159, -12.70763], + "origin": [-0.36333, -0.30159, -13.70763], "size": [0.72667, 0.03109, 0.21], "uv": { "east": {"uv": [84.5, 57.5], "uv_size": [0.25, 0.25]}, @@ -1213,9 +1213,9 @@ } }, { - "origin": [-0.31333, 0.30725, -7.35569], + "origin": [-0.31333, 0.30725, -8.35569], "size": [0.62667, 0.27094, 0.41469], - "pivot": [0, -0.13775, -8.58663], + "pivot": [0, -0.13775, -9.58663], "rotation": [145, 0, 0], "uv": { "north": {"uv": [85, 53], "uv_size": [0.25, 0.25]}, @@ -1224,9 +1224,9 @@ } }, { - "origin": [-0.31333, -0.38228, -11.45273], + "origin": [-0.31333, -0.38228, -12.45273], "size": [0.62667, 0.5, 0.51469], - "pivot": [0.1, 0.06491, -10.94539], + "pivot": [0.1, 0.06491, -11.94539], "rotation": [100, 0, 0], "uv": { "north": {"uv": [81, 58], "uv_size": [0.25, 0.25]}, @@ -1240,12 +1240,12 @@ { "name": "bone40", "parent": "Grip2", - "pivot": [0.60362, -4.1583, -11.66847], + "pivot": [0.60362, -4.1583, -12.66847], "cubes": [ { - "origin": [0.59369, 0.55989, -12.29181], + "origin": [0.59369, 0.55989, -13.29181], "size": [0.05, 0.11865, 1.09667], - "pivot": [0.61869, 0.61921, -11.66847], + "pivot": [0.61869, 0.61921, -12.66847], "rotation": [0, 0, 30], "uv": { "north": {"uv": [85, 56], "uv_size": [0.25, 0.25]}, @@ -1254,7 +1254,7 @@ } }, { - "origin": [0.62, 0.65809, -12.29181], + "origin": [0.62, 0.65809, -13.29181], "size": [0.05, 0.11865, 1.09667], "uv": { "north": {"uv": [85, 55.5], "uv_size": [0.25, 0.25]}, @@ -1263,9 +1263,9 @@ } }, { - "origin": [3.07862, 0.08238, -12.29181], + "origin": [3.07862, 0.08238, -13.29181], "size": [0.05, 0.11865, 1.09667], - "pivot": [0.60362, -4.1583, -11.66847], + "pivot": [0.60362, -4.1583, -12.66847], "rotation": [0, 0, -30], "uv": { "north": {"uv": [85, 56.5], "uv_size": [0.25, 0.25]}, @@ -1278,12 +1278,12 @@ { "name": "bone41", "parent": "Grip2", - "pivot": [-0.60362, -4.1583, -11.66847], + "pivot": [-0.60362, -4.1583, -12.66847], "cubes": [ { - "origin": [-0.64369, 0.55989, -12.29181], + "origin": [-0.64369, 0.55989, -13.29181], "size": [0.05, 0.11865, 1.09667], - "pivot": [-0.61869, 0.61921, -11.66847], + "pivot": [-0.61869, 0.61921, -12.66847], "rotation": [0, 0, -30], "uv": { "north": {"uv": [85, 57], "uv_size": [0.25, 0.25]}, @@ -1292,7 +1292,7 @@ } }, { - "origin": [-0.67, 0.65809, -12.29181], + "origin": [-0.67, 0.65809, -13.29181], "size": [0.05, 0.11865, 1.09667], "uv": { "north": {"uv": [85, 57.5], "uv_size": [0.25, 0.25]}, @@ -1301,9 +1301,9 @@ } }, { - "origin": [-3.12862, 0.08238, -12.29181], + "origin": [-3.12862, 0.08238, -13.29181], "size": [0.05, 0.11865, 1.09667], - "pivot": [-0.60362, -4.1583, -11.66847], + "pivot": [-0.60362, -4.1583, -12.66847], "rotation": [0, 0, 30], "uv": { "north": {"uv": [79, 58.5], "uv_size": [0.25, 0.25]}, @@ -1316,12 +1316,12 @@ { "name": "bone42", "parent": "Grip2", - "pivot": [0.22628, -0.58143, -10.22966], + "pivot": [0.22628, -0.58143, -11.22966], "cubes": [ { - "origin": [-0.41333, -2.00193, -10.8504], + "origin": [-0.41333, -2.00193, -11.8504], "size": [0.82667, 2.52094, 0.31469], - "pivot": [0.1, 0.10307, -10.78134], + "pivot": [0.1, 0.10307, -11.78134], "rotation": [55, 0, 0], "uv": { "east": {"uv": [79.5, 55], "uv_size": [0.25, 1.25]}, @@ -1329,54 +1329,54 @@ } }, { - "origin": [-0.31333, -2.00193, -10.9504], + "origin": [-0.31333, -2.00193, -11.9504], "size": [0.62667, 2.52094, 0.1], - "pivot": [0.1, 0.10307, -10.78134], + "pivot": [0.1, 0.10307, -11.78134], "rotation": [55, 0, 0], "uv": { "north": {"uv": [81.5, 55], "uv_size": [0.25, 1.25]} } }, { - "origin": [1.40731, -0.73903, -10.89132], + "origin": [1.40731, -0.73903, -11.89132], "size": [0.02667, 2.52094, 0.141], - "pivot": [1.07064, 0.52144, -9.45742], + "pivot": [1.07064, 0.52144, -10.45742], "rotation": [63.659, 23.92746, 39.32269], "uv": { "west": {"uv": [82, 55], "uv_size": [0.25, 1.25]} } }, { - "origin": [-1.43397, -0.73903, -10.89132], + "origin": [-1.43397, -0.73903, -11.89132], "size": [0.02667, 2.52094, 0.141], - "pivot": [-1.07064, 0.52144, -9.45742], + "pivot": [-1.07064, 0.52144, -10.45742], "rotation": [63.659, -23.92746, -39.32269], "uv": { "east": {"uv": [82.5, 55], "uv_size": [0.25, 1.25]} } }, { - "origin": [-0.31333, -2.02569, -15.56986], + "origin": [-0.31333, -2.02569, -16.56986], "size": [0.62667, 1.92094, 0.1], - "pivot": [0.1, -2.20975, -12.4008], + "pivot": [0.1, -2.20975, -13.4008], "rotation": [-125, 0, 0], "uv": { "north": {"uv": [80, 56.5], "uv_size": [0.25, 1]} } }, { - "origin": [0.56039, -1.8419, -10.30016], + "origin": [0.56039, -1.8419, -11.30016], "size": [0.02667, 1.92094, 0.141], - "pivot": [-0.17628, -0.58143, -10.22966], + "pivot": [-0.17628, -0.58143, -11.22966], "rotation": [63.659, -23.92746, -39.32269], "uv": { "west": {"uv": [81, 56.5], "uv_size": [0.25, 1]} } }, { - "origin": [-0.58706, -1.8419, -10.30016], + "origin": [-0.58706, -1.8419, -11.30016], "size": [0.02667, 1.92094, 0.141], - "pivot": [0.17628, -0.58143, -10.22966], + "pivot": [0.17628, -0.58143, -11.22966], "rotation": [63.659, 23.92746, 39.32269], "uv": { "east": {"uv": [81.5, 56.5], "uv_size": [0.25, 1]} @@ -1387,13 +1387,13 @@ { "name": "bone43", "parent": "Grip2", - "pivot": [0.22628, -0.58143, -10.22966], + "pivot": [0.22628, -0.58143, -11.22966], "rotation": [90, 0, 0], "cubes": [ { - "origin": [-0.41333, -4.09558, -10.91205], + "origin": [-0.41333, -4.09558, -11.91205], "size": [0.82667, 2.52094, 0.31469], - "pivot": [0.1, -1.99058, -10.84298], + "pivot": [0.1, -1.99058, -11.84298], "rotation": [55, 0, 0], "uv": { "east": {"uv": [83, 52], "uv_size": [0.25, 1.25]}, @@ -1403,9 +1403,9 @@ } }, { - "origin": [-0.31333, -4.09558, -11.01205], + "origin": [-0.31333, -4.09558, -12.01205], "size": [0.62667, 2.52094, 0.1], - "pivot": [0.1, -1.99058, -10.84298], + "pivot": [0.1, -1.99058, -11.84298], "rotation": [55, 0, 0], "uv": { "north": {"uv": [79, 56.5], "uv_size": [0.25, 1.25]}, @@ -1413,9 +1413,9 @@ } }, { - "origin": [1.33397, -2.83268, -10.95297], + "origin": [1.33397, -2.83268, -11.95297], "size": [0.1, 2.52094, 0.141], - "pivot": [1.07064, -1.57221, -9.51906], + "pivot": [1.07064, -1.57221, -10.51906], "rotation": [63.659, 23.92746, 39.32269], "uv": { "west": {"uv": [83.5, 52], "uv_size": [0.25, 1.25]}, @@ -1423,9 +1423,9 @@ } }, { - "origin": [-1.43368, -2.83293, -10.95314], + "origin": [-1.43368, -2.83293, -11.95314], "size": [0.1, 2.52094, 0.141], - "pivot": [-1.07034, -1.57246, -9.51923], + "pivot": [-1.07034, -1.57246, -10.51923], "rotation": [63.659, -23.92746, -39.32269], "uv": { "east": {"uv": [79.5, 56.5], "uv_size": [0.25, 1.25]}, @@ -1433,27 +1433,27 @@ } }, { - "origin": [-0.31333, -4.11934, -15.6315], + "origin": [-0.31333, -4.11934, -16.6315], "size": [0.62667, 1.92094, 0.1], - "pivot": [0.1, -4.3034, -12.46244], + "pivot": [0.1, -4.3034, -13.46244], "rotation": [-125, 0, 0], "uv": { "north": {"uv": [82, 56.5], "uv_size": [0.25, 1]} } }, { - "origin": [0.56039, -3.93556, -10.3618], + "origin": [0.56039, -3.93556, -11.3618], "size": [0.02667, 1.92094, 0.141], - "pivot": [-0.17628, -2.67509, -10.2913], + "pivot": [-0.17628, -2.67509, -11.2913], "rotation": [63.659, -23.92746, -39.32269], "uv": { "west": {"uv": [83.5, 55], "uv_size": [0.25, 1]} } }, { - "origin": [-0.58706, -3.93556, -10.3618], + "origin": [-0.58706, -3.93556, -11.3618], "size": [0.02667, 1.92094, 0.141], - "pivot": [0.17628, -2.67509, -10.2913], + "pivot": [0.17628, -2.67509, -11.2913], "rotation": [63.659, 23.92746, 39.32269], "uv": { "east": {"uv": [82.5, 56.5], "uv_size": [0.25, 1]} diff --git a/src/main/resources/assets/superbwarfare/sounds/hk_416/hk_416_fire_1p.ogg b/src/main/resources/assets/superbwarfare/sounds/hk_416/hk_416_fire_1p.ogg index b2e6c3765..81b6395ab 100644 Binary files a/src/main/resources/assets/superbwarfare/sounds/hk_416/hk_416_fire_1p.ogg and b/src/main/resources/assets/superbwarfare/sounds/hk_416/hk_416_fire_1p.ogg differ diff --git a/src/main/resources/assets/superbwarfare/sounds/hk_416/hk_416_fire_3p.ogg b/src/main/resources/assets/superbwarfare/sounds/hk_416/hk_416_fire_3p.ogg index dd1bb0d88..ba5a7dafb 100644 Binary files a/src/main/resources/assets/superbwarfare/sounds/hk_416/hk_416_fire_3p.ogg and b/src/main/resources/assets/superbwarfare/sounds/hk_416/hk_416_fire_3p.ogg differ