diff --git a/src/main/java/com/atsuishio/superbwarfare/client/AnimationHelper.java b/src/main/java/com/atsuishio/superbwarfare/client/AnimationHelper.java index 02c845d48..1874b0b1f 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/AnimationHelper.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/AnimationHelper.java @@ -1,7 +1,6 @@ package com.atsuishio.superbwarfare.client; import com.atsuishio.superbwarfare.Mod; -import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; import com.atsuishio.superbwarfare.client.renderer.ModRenderTypes; import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.data.gun.value.AttachmentType; @@ -173,15 +172,12 @@ public class AnimationHelper { .setNormal(pNormal, 0.0F, 1.0F, 0.0F); } + public static final float SCALE_RECIPROCAL = 1 / 16.0f; + public static void renderArms(LocalPlayer localPlayer, ItemDisplayContext transformType, PoseStack stack, String name, GeoBone bone, MultiBufferSource currentBuffer, RenderType renderType, int packedLightIn, boolean useOldHandRender) { if (transformType.firstPerson()) { - Minecraft mc = Minecraft.getInstance(); - - if (localPlayer == null) { - return; - } - + var mc = Minecraft.getInstance(); PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); @@ -191,28 +187,25 @@ public class AnimationHelper { RenderUtil.scaleMatrixForBone(stack, bone); RenderUtil.translateAwayFromPivotPoint(stack, bone); ResourceLocation loc = localPlayer.getSkin().texture(); - VertexConsumer armBuilder = currentBuffer.getBuffer(RenderType.entitySolid(loc)); - VertexConsumer sleeveBuilder = currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); if (name.equals("Lefthand")) { - stack.translate(-1.0f * CustomGunRenderer.SCALE_RECIPROCAL, 2.0f * CustomGunRenderer.SCALE_RECIPROCAL, 0.0f); + stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); if (useOldHandRender) { - AnimationHelper.renderPartOverBone(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY); - AnimationHelper.renderPartOverBone(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBone(model.leftArm, bone, stack, currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBone(model.leftSleeve, bone, stack, currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } else { - AnimationHelper.renderPartOverBone2(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY); - AnimationHelper.renderPartOverBone2(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBone2(model.leftArm, bone, stack, currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBone2(model.leftSleeve, bone, stack, currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } } else { - stack.translate(CustomGunRenderer.SCALE_RECIPROCAL, 2.0f * CustomGunRenderer.SCALE_RECIPROCAL, 0.0f); + stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); if (useOldHandRender) { - AnimationHelper.renderPartOverBone(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY); - AnimationHelper.renderPartOverBone(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBoneR(model.leftArm, bone, stack, currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBoneR(model.leftSleeve, bone, stack, currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } else { - AnimationHelper.renderPartOverBone2(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY); - AnimationHelper.renderPartOverBone2(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBone2R(model.leftArm, bone, stack, currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBone2R(model.leftSleeve, bone, stack, currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } } - currentBuffer.getBuffer(renderType); stack.popPose(); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Glock17ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Glock17ItemRenderer.java index 5c8f71b64..e30a1ed60 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Glock17ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Glock17ItemRenderer.java @@ -37,7 +37,7 @@ public class Glock17ItemRenderer extends CustomGunRenderer { AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0, 0.3022, 0.3); if (renderingArms) { - AnimationHelper.renderArms(mc, player, this.transformType, stack, name, bone, SCALE_RECIPROCAL, this.currentBuffer, type, packedLightIn, false, false); + AnimationHelper.renderArms(player, this.transformType, stack, name, bone, this.currentBuffer, type, packedLightIn, false); } super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Glock18ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Glock18ItemRenderer.java index 6d1025deb..17a6ed917 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Glock18ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Glock18ItemRenderer.java @@ -37,7 +37,7 @@ public class Glock18ItemRenderer extends CustomGunRenderer { AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0, 0.3022, 0.3); if (renderingArms) { - AnimationHelper.renderArms(mc, player, this.transformType, stack, name, bone, SCALE_RECIPROCAL, this.currentBuffer, type, packedLightIn, false, false); + AnimationHelper.renderArms(player, this.transformType, stack, name, bone, this.currentBuffer, type, packedLightIn, false); } super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Hk416ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Hk416ItemRenderer.java index f0e121bfb..306e74763 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Hk416ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Hk416ItemRenderer.java @@ -64,7 +64,7 @@ public class Hk416ItemRenderer extends CustomGunRenderer { ItemModelHelper.handleGunAttachments(bone, itemStack, name); if (renderingArms) { - AnimationHelper.renderArms(mc, player, this.transformType, stack, name, bone, SCALE_RECIPROCAL, this.currentBuffer, type, packedLightIn, false, false); + AnimationHelper.renderArms(player, this.transformType, stack, name, bone, this.currentBuffer, type, packedLightIn, false); } super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/HomemadeShotgunItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/HomemadeShotgunItemRenderer.java index 671ea758a..c2d76f0c5 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/HomemadeShotgunItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/HomemadeShotgunItemRenderer.java @@ -38,7 +38,7 @@ public class HomemadeShotgunItemRenderer extends CustomGunRenderer { AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, 0, 0.359325, 40, 0.33f, 255, 0, 0, 255, "insidious", false); if (renderingArms) { - AnimationHelper.renderArms(mc, player, this.transformType, stack, name, bone, SCALE_RECIPROCAL, this.currentBuffer, type, packedLightIn, false, false); + AnimationHelper.renderArms(player, this.transformType, stack, name, bone, this.currentBuffer, type, packedLightIn, false); } super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/K98ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/K98ItemRenderer.java index 4c30ae51e..ecb75ac2b 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/K98ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/K98ItemRenderer.java @@ -37,7 +37,7 @@ public class K98ItemRenderer extends CustomGunRenderer { AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0, 1.9772, 0.4); if (renderingArms) { - AnimationHelper.renderArms(mc, player, this.transformType, stack, name, bone, SCALE_RECIPROCAL, this.currentBuffer, type, packedLightIn, true, true); + AnimationHelper.renderArms(player, this.transformType, stack, name, bone, this.currentBuffer, type, packedLightIn, true); } super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M1911ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M1911ItemRenderer.java index 5bdea847b..ce83ed8f8 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M1911ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M1911ItemRenderer.java @@ -2,6 +2,7 @@ package com.atsuishio.superbwarfare.client.renderer.gun; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.model.item.M1911ItemModel; +import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.item.gun.handgun.M1911Item; import com.mojang.blaze3d.vertex.PoseStack; @@ -10,54 +11,15 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; -import software.bernie.geckolib.cache.object.BakedGeoModel; import software.bernie.geckolib.cache.object.GeoBone; -import software.bernie.geckolib.renderer.GeoItemRenderer; -import java.util.HashSet; -import java.util.Set; - -public class M1911ItemRenderer extends GeoItemRenderer { +public class M1911ItemRenderer extends CustomGunRenderer { public M1911ItemRenderer() { super(new M1911ItemModel()); } - @Override - public RenderType getRenderType(M1911Item animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { - return RenderType.entityTranslucent(getTextureLocation(animatable)); - } - - private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; - protected boolean renderArms = false; - protected MultiBufferSource currentBuffer; - protected RenderType renderType; - public ItemDisplayContext transformType; - protected M1911Item animatable; - private final Set hiddenBones = new HashSet<>(); - - @Override - public void renderByItem(ItemStack stack, ItemDisplayContext transformType, PoseStack matrixStack, MultiBufferSource bufferIn, int combinedLightIn, int p_239207_6_) { - this.transformType = transformType; - if (this.animatable != null) - this.animatable.getTransformType(transformType); - super.renderByItem(stack, transformType, matrixStack, bufferIn, combinedLightIn, p_239207_6_); - } - - @Override - public void actuallyRender(PoseStack matrixStackIn, M1911Item animatable, BakedGeoModel model, RenderType type, MultiBufferSource renderTypeBuffer, VertexConsumer vertexBuilder, boolean isRenderer, float partialTicks, int packedLightIn, - int packedOverlayIn, int color) { - this.currentBuffer = renderTypeBuffer; - this.renderType = type; - this.animatable = animatable; - super.actuallyRender(matrixStackIn, animatable, model, type, renderTypeBuffer, vertexBuilder, isRenderer, partialTicks, packedLightIn, packedOverlayIn, color); - if (this.renderArms) { - this.renderArms = false; - } - } - @Override public void renderRecursively(PoseStack stack, M1911Item animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, int color) { Minecraft mc = Minecraft.getInstance(); @@ -66,8 +28,6 @@ public class M1911ItemRenderer extends GeoItemRenderer { if (name.equals("Lefthand") || name.equals("Righthand")) { bone.setHidden(true); renderingArms = true; - } else { - bone.setHidden(this.hiddenBones.contains(name)); } var player = mc.player; @@ -78,7 +38,7 @@ public class M1911ItemRenderer extends GeoItemRenderer { AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0, 0.442825, 0.35); if (renderingArms) { - AnimationHelper.renderArms(mc, player, this.transformType, stack, name, bone, SCALE_RECIPROCAL, this.currentBuffer, type, packedLightIn, false, false); + AnimationHelper.renderArms(player, this.transformType, stack, name, bone, this.currentBuffer, type, packedLightIn, false); } super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M4ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M4ItemRenderer.java index bf5fea84c..d910e34ac 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M4ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M4ItemRenderer.java @@ -73,7 +73,7 @@ public class M4ItemRenderer extends CustomGunRenderer { ItemModelHelper.handleGunAttachments(bone, itemStack, name); if (renderingArms) { - AnimationHelper.renderArms(mc, player, this.transformType, stack, name, bone, SCALE_RECIPROCAL, this.currentBuffer, type, packedLightIn, false, false); + AnimationHelper.renderArms(player, this.transformType, stack, name, bone, this.currentBuffer, type, packedLightIn, false); } super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M60ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M60ItemRenderer.java index 99ffd5d47..f504aff51 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M60ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M60ItemRenderer.java @@ -37,7 +37,7 @@ public class M60ItemRenderer extends CustomGunRenderer { AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0.1, 1.95, 0.45); if (renderingArms) { - AnimationHelper.renderArms(mc, player, this.transformType, stack, name, bone, SCALE_RECIPROCAL, this.currentBuffer, type, packedLightIn, true, true); + AnimationHelper.renderArms(player, this.transformType, stack, name, bone, this.currentBuffer, type, packedLightIn, true); } super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M79ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M79ItemRenderer.java index d1762e7aa..73d442b5d 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M79ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M79ItemRenderer.java @@ -37,7 +37,7 @@ public class M79ItemRenderer extends CustomGunRenderer { AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0, 0.59375, 0.6); if (renderingArms) { - AnimationHelper.renderArms(mc, player, this.transformType, stack, name, bone, SCALE_RECIPROCAL, this.currentBuffer, type, packedLightIn, true, true); + AnimationHelper.renderArms(player, this.transformType, stack, name, bone, this.currentBuffer, type, packedLightIn, true); } super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M870ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M870ItemRenderer.java index f8d58cf04..831129795 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M870ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M870ItemRenderer.java @@ -37,7 +37,7 @@ public class M870ItemRenderer extends CustomGunRenderer { AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0, 1.4209, 0.6); if (renderingArms) { - AnimationHelper.renderArms(mc, player, this.transformType, stack, name, bone, SCALE_RECIPROCAL, this.currentBuffer, type, packedLightIn, true, true); + AnimationHelper.renderArms(player, this.transformType, stack, name, bone, this.currentBuffer, type, packedLightIn, true); } super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M98bItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M98bItemRenderer.java index 40c58ab8f..d8cf13c47 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M98bItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M98bItemRenderer.java @@ -46,7 +46,7 @@ public class M98bItemRenderer extends CustomGunRenderer { } if (renderingArms) { - AnimationHelper.renderArms(mc, player, this.transformType, stack, name, bone, SCALE_RECIPROCAL, this.currentBuffer, type, packedLightIn, true, true); + AnimationHelper.renderArms(player, this.transformType, stack, name, bone, this.currentBuffer, type, packedLightIn, true); } super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/MarlinItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/MarlinItemRenderer.java index 84b062797..70a9207da 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/MarlinItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/MarlinItemRenderer.java @@ -37,7 +37,7 @@ public class MarlinItemRenderer extends CustomGunRenderer { AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0, 1.33720625, 0.4); if (renderingArms) { - AnimationHelper.renderArms(mc, player, this.transformType, stack, name, bone, SCALE_RECIPROCAL, this.currentBuffer, type, packedLightIn, true, true); + AnimationHelper.renderArms(player, this.transformType, stack, name, bone, this.currentBuffer, type, packedLightIn, true); } super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/MinigunItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/MinigunItemRenderer.java index 55691e5d4..41f31e690 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/MinigunItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/MinigunItemRenderer.java @@ -45,7 +45,7 @@ public class MinigunItemRenderer extends CustomGunRenderer { AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0.1, 1.45, 0.9); if (renderingArms) { - AnimationHelper.renderArms(mc, player, this.transformType, stack, name, bone, SCALE_RECIPROCAL, this.currentBuffer, type, packedLightIn, true, true); + AnimationHelper.renderArms(player, this.transformType, stack, name, bone, this.currentBuffer, type, packedLightIn, true); } super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Mk14ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Mk14ItemRenderer.java index ffe816234..84ec8066c 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Mk14ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Mk14ItemRenderer.java @@ -68,7 +68,7 @@ public class Mk14ItemRenderer extends CustomGunRenderer { ItemModelHelper.handleGunAttachments(bone, itemStack, name); if (renderingArms) { - AnimationHelper.renderArms(mc, player, this.transformType, stack, name, bone, SCALE_RECIPROCAL, this.currentBuffer, type, packedLightIn, true, true); + AnimationHelper.renderArms(player, this.transformType, stack, name, bone, this.currentBuffer, type, packedLightIn, true); } super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/MosinNagantItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/MosinNagantItemRenderer.java index 16694d715..0895c9396 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/MosinNagantItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/MosinNagantItemRenderer.java @@ -44,7 +44,7 @@ public class MosinNagantItemRenderer extends CustomGunRenderer AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0, 2.38345, 0.6); if (renderingArms) { - AnimationHelper.renderArms(mc, player, this.transformType, stack, name, bone, SCALE_RECIPROCAL, this.currentBuffer, type, packedLightIn, true, true); + AnimationHelper.renderArms(player, this.transformType, stack, name, bone, this.currentBuffer, type, packedLightIn, true); } super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Mp443ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Mp443ItemRenderer.java index 266212d8e..6e03ef7d9 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Mp443ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Mp443ItemRenderer.java @@ -37,7 +37,7 @@ public class Mp443ItemRenderer extends CustomGunRenderer { AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0, 0.33345, 0.3); if (renderingArms) { - AnimationHelper.renderArms(mc, player, this.transformType, stack, name, bone, SCALE_RECIPROCAL, this.currentBuffer, type, packedLightIn, false, false); + AnimationHelper.renderArms(player, this.transformType, stack, name, bone, this.currentBuffer, type, packedLightIn, false); } super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Ntw20Renderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Ntw20Renderer.java index ff8a790ac..aa7a8c9fe 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Ntw20Renderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Ntw20Renderer.java @@ -68,7 +68,7 @@ public class Ntw20Renderer extends CustomGunRenderer { ItemModelHelper.handleGunAttachments(bone, itemStack, name); if (renderingArms) { - AnimationHelper.renderArms(mc, player, this.transformType, stack, name, bone, SCALE_RECIPROCAL, this.currentBuffer, type, packedLightIn, false, false); + AnimationHelper.renderArms(player, this.transformType, stack, name, bone, this.currentBuffer, type, packedLightIn, false); } super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Qbz95ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Qbz95ItemRenderer.java index e678eb79a..177a53fb9 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Qbz95ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Qbz95ItemRenderer.java @@ -76,7 +76,7 @@ public class Qbz95ItemRenderer extends CustomGunRenderer { ItemModelHelper.handleGunAttachments(bone, itemStack, name); if (renderingArms) { - AnimationHelper.renderArms(mc, player, this.transformType, stack, name, bone, SCALE_RECIPROCAL, this.currentBuffer, type, packedLightIn, true, true); + AnimationHelper.renderArms(player, this.transformType, stack, name, bone, this.currentBuffer, type, packedLightIn, true); } super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/RpgItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/RpgItemRenderer.java index 07efa73b0..19800e125 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/RpgItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/RpgItemRenderer.java @@ -42,7 +42,7 @@ public class RpgItemRenderer extends CustomGunRenderer { AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0, 0.625, 0.7); if (renderingArms) { - AnimationHelper.renderArms(mc, player, this.transformType, stack, name, bone, SCALE_RECIPROCAL, this.currentBuffer, type, packedLightIn, false, false); + AnimationHelper.renderArms(player, this.transformType, stack, name, bone, this.currentBuffer, type, packedLightIn, false); } super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/RpkItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/RpkItemRenderer.java index 6b1b95615..4af54d86c 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/RpkItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/RpkItemRenderer.java @@ -79,7 +79,7 @@ public class RpkItemRenderer extends CustomGunRenderer { ItemModelHelper.handleGunAttachments(bone, itemStack, name); if (renderingArms) { - AnimationHelper.renderArms(mc, player, this.transformType, stack, name, bone, SCALE_RECIPROCAL, this.currentBuffer, type, packedLightIn, false, false); + AnimationHelper.renderArms(player, this.transformType, stack, name, bone, this.currentBuffer, type, packedLightIn, false); } super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/SecondaryCataclysmRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/SecondaryCataclysmRenderer.java index f63e823d2..506ad153f 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/SecondaryCataclysmRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/SecondaryCataclysmRenderer.java @@ -37,7 +37,7 @@ public class SecondaryCataclysmRenderer extends CustomGunRenderer { AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0, 1.53125, 0.6); if (renderingArms) { - AnimationHelper.renderArms(mc, player, this.transformType, stack, name, bone, SCALE_RECIPROCAL, this.currentBuffer, type, packedLightIn, true, true); + AnimationHelper.renderArms(player, this.transformType, stack, name, bone, this.currentBuffer, type, packedLightIn, true); } super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/SksItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/SksItemRenderer.java index f111f67d2..1be186a32 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/SksItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/SksItemRenderer.java @@ -39,7 +39,7 @@ public class SksItemRenderer extends CustomGunRenderer { AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0, 1.4375, 0.35); if (renderingArms) { - AnimationHelper.renderArms(mc, player, this.transformType, stack, name, bone, SCALE_RECIPROCAL, this.currentBuffer, type, packedLightIn, true, true); + AnimationHelper.renderArms(player, this.transformType, stack, name, bone, this.currentBuffer, type, packedLightIn, true); } super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/SvdItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/SvdItemRenderer.java index 2787b55ff..a2761887c 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/SvdItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/SvdItemRenderer.java @@ -65,7 +65,7 @@ public class SvdItemRenderer extends CustomGunRenderer { ItemModelHelper.handleGunAttachments(bone, itemStack, name); if (renderingArms) { - AnimationHelper.renderArms(mc, player, this.transformType, stack, name, bone, SCALE_RECIPROCAL, this.currentBuffer, type, packedLightIn, false, false); + AnimationHelper.renderArms(player, this.transformType, stack, name, bone, this.currentBuffer, type, packedLightIn, false); } super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/TaserItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/TaserItemRenderer.java index d5fc22638..7523bf2d6 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/TaserItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/TaserItemRenderer.java @@ -35,7 +35,7 @@ public class TaserItemRenderer extends CustomGunRenderer { if (!(itemStack.getItem() instanceof GunItem)) return; if (renderingArms) { - AnimationHelper.renderArms(mc, player, this.transformType, stack, name, bone, SCALE_RECIPROCAL, this.currentBuffer, type, packedLightIn, false, false); + AnimationHelper.renderArms(player, this.transformType, stack, name, bone, this.currentBuffer, type, packedLightIn, false); } super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/TracheliumItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/TracheliumItemRenderer.java index 43ad8bbe3..bc7043f73 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/TracheliumItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/TracheliumItemRenderer.java @@ -79,7 +79,7 @@ public class TracheliumItemRenderer extends CustomGunRenderer { AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0, 0.734375, 0.5); if (renderingArms) { - AnimationHelper.renderArms(mc, player, this.transformType, stack, name, bone, SCALE_RECIPROCAL, this.currentBuffer, type, packedLightIn, true, true); + AnimationHelper.renderArms(player, this.transformType, stack, name, bone, this.currentBuffer, type, packedLightIn, true); } super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/VectorItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/VectorItemRenderer.java index 09d8371d7..3cad4475b 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/VectorItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/VectorItemRenderer.java @@ -56,7 +56,7 @@ public class VectorItemRenderer extends CustomGunRenderer { if (renderingArms) { - AnimationHelper.renderArms(mc, player, this.transformType, stack, name, bone, SCALE_RECIPROCAL, this.currentBuffer, type, packedLightIn, true, true); + AnimationHelper.renderArms(player, this.transformType, stack, name, bone, this.currentBuffer, type, packedLightIn, true); } super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/LungeMineRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/LungeMineRenderer.java index 05d8e59a5..cec85a45b 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/LungeMineRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/LungeMineRenderer.java @@ -29,7 +29,6 @@ public class LungeMineRenderer extends GeoItemRenderer { return RenderType.entityTranslucent(getTextureLocation(animatable)); } - private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; protected boolean renderArms = false; protected MultiBufferSource currentBuffer; protected RenderType renderType; @@ -73,7 +72,7 @@ public class LungeMineRenderer extends GeoItemRenderer { if (player == null) return; if (renderingArms) { - AnimationHelper.renderArms(mc, player, this.transformType, stack, name, bone, SCALE_RECIPROCAL, this.currentBuffer, type, packedLightIn, true, true); + AnimationHelper.renderArms(player, this.transformType, stack, name, bone, this.currentBuffer, type, packedLightIn, true); } super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); }