From de72843df5d275480ac8e1410160883f5f172a3d Mon Sep 17 00:00:00 2001 From: Atsuishio <842960157@qq.com> Date: Wed, 2 Apr 2025 04:19:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=80=E6=9C=89=E7=9A=84?= =?UTF-8?q?=E6=89=8B=E8=87=82=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../superbwarfare/client/AnimationHelper.java | 42 ++++++++++++------- .../client/layer/gun/AK47Layer.java | 4 +- .../renderer/item/AK12ItemRenderer.java | 24 ++++------- .../renderer/item/AK47ItemRenderer.java | 24 ++++------- .../renderer/item/Aa12ItemRenderer.java | 24 ++++------- .../renderer/item/BocekItemRenderer.java | 22 +++------- .../renderer/item/DevotionItemRenderer.java | 24 ++++------- .../renderer/item/Glock17ItemRenderer.java | 24 ++++------- .../renderer/item/Glock18ItemRenderer.java | 24 ++++------- .../renderer/item/Hk416ItemRenderer.java | 24 ++++------- .../item/HomemadeShotgunItemRenderer.java | 24 ++++------- .../item/HuntingRifleItemRenderer.java | 24 ++++------- .../client/renderer/item/K98ItemRenderer.java | 24 ++++------- .../renderer/item/LungeMineRenderer.java | 24 ++++------- .../renderer/item/M1911ItemRenderer.java | 24 ++++------- .../client/renderer/item/M4ItemRenderer.java | 24 ++++------- .../client/renderer/item/M60ItemRenderer.java | 24 ++++------- .../client/renderer/item/M79ItemRenderer.java | 24 ++++------- .../renderer/item/M870ItemRenderer.java | 24 ++++------- .../renderer/item/M98bItemRenderer.java | 24 ++++------- .../renderer/item/MarlinItemRenderer.java | 24 ++++------- .../renderer/item/MinigunItemRenderer.java | 24 ++++------- .../renderer/item/Mk14ItemRenderer.java | 24 ++++------- .../item/MosinNagantItemRenderer.java | 24 ++++------- .../renderer/item/Mp443ItemRenderer.java | 24 ++++------- .../client/renderer/item/Ntw20Renderer.java | 24 ++++------- .../renderer/item/Qbz95ItemRenderer.java | 24 ++++------- .../client/renderer/item/RpgItemRenderer.java | 24 ++++------- .../client/renderer/item/RpkItemRenderer.java | 24 ++++------- .../item/SecondaryCataclysmRenderer.java | 24 ++++------- .../renderer/item/SentinelItemRenderer.java | 24 ++++------- .../client/renderer/item/SksItemRenderer.java | 24 ++++------- .../client/renderer/item/SvdItemRenderer.java | 24 ++++------- .../renderer/item/TaserItemRenderer.java | 24 ++++------- .../renderer/item/TracheliumItemRenderer.java | 24 ++++------- .../renderer/item/VectorItemRenderer.java | 28 +++++-------- 36 files changed, 270 insertions(+), 594 deletions(-) diff --git a/src/main/java/com/atsuishio/superbwarfare/client/AnimationHelper.java b/src/main/java/com/atsuishio/superbwarfare/client/AnimationHelper.java index 052c0b4fe..c3dc2f2d4 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/AnimationHelper.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/AnimationHelper.java @@ -6,7 +6,6 @@ import com.atsuishio.superbwarfare.tools.NBTTool; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.model.geom.ModelPart; -import net.minecraft.util.FastColor; import net.minecraft.util.Mth; import net.minecraft.world.item.ItemStack; import software.bernie.geckolib.animation.AnimationProcessor; @@ -14,15 +13,9 @@ import software.bernie.geckolib.cache.object.GeoBone; public class AnimationHelper { - public static void renderPartOverBone(ModelPart model, GeoBone bone, PoseStack stack, VertexConsumer buffer, int packedLightIn, int packedOverlayIn, float alpha) { - renderPartOverBone(model, bone, stack, buffer, packedLightIn, packedOverlayIn, 1.0f, 1.0f, 1.0f, alpha); - } - - public static void renderPartOverBone(ModelPart model, GeoBone bone, PoseStack stack, VertexConsumer buffer, int packedLightIn, int packedOverlayIn, float r, float g, float b, float a) { + public static void renderPartOverBone(ModelPart model, GeoBone bone, PoseStack stack, VertexConsumer buffer, int packedLightIn, int packedOverlayIn) { setupModelFromBone(model, bone); - var color = FastColor.ARGB32.color((int) (a * 255), (int) (r * 255), (int) (g * 255), (int) (b * 255)); - // TODO model.render - // model.render(stack, buffer, packedLightIn, packedOverlayIn, color); + model.render(stack, buffer, packedLightIn, packedOverlayIn); } public static void setupModelFromBone(ModelPart model, GeoBone bone) { @@ -32,16 +25,21 @@ public class AnimationHelper { model.zRot = 0.0f; } - public static void renderPartOverBone2(ModelPart model, GeoBone bone, PoseStack stack, VertexConsumer buffer, int packedLightIn, int packedOverlayIn, float alpha) { - renderPartOverBone2(model, bone, stack, buffer, packedLightIn, packedOverlayIn, 1.0f, 1.0f, 1.0f, alpha); + public static void renderPartOverBoneR(ModelPart model, GeoBone bone, PoseStack stack, VertexConsumer buffer, int packedLightIn, int packedOverlayIn) { + setupModelFromBone(model, bone); + model.render(stack, buffer, packedLightIn, packedOverlayIn); } - public static void renderPartOverBone2(ModelPart model, GeoBone bone, PoseStack stack, VertexConsumer buffer, int packedLightIn, int packedOverlayIn, float r, float g, float b, float a) { - setupModelFromBone2(model, bone); - var color = FastColor.ARGB32.color((int) (a * 255), (int) (r * 255), (int) (g * 255), (int) (b * 255)); + public static void setupModelFromBoneR(ModelPart model, GeoBone bone) { + model.setPos(bone.getPivotX(), bone.getPivotY(), bone.getPivotZ()); + model.xRot = 0.0f; + model.yRot = 0.0f; + model.zRot = 0.0f; + } - // TODO model.render - // model.render(stack, buffer, packedLightIn, packedOverlayIn, color); + public static void renderPartOverBone2(ModelPart model, GeoBone bone, PoseStack stack, VertexConsumer buffer, int packedLightIn, int packedOverlayIn) { + setupModelFromBone2(model, bone); + model.render(stack, buffer, packedLightIn, packedOverlayIn); } public static void setupModelFromBone2(ModelPart model, GeoBone bone) { @@ -51,6 +49,18 @@ public class AnimationHelper { model.zRot = 180 * Mth.DEG_TO_RAD; } + public static void renderPartOverBone2R(ModelPart model, GeoBone bone, PoseStack stack, VertexConsumer buffer, int packedLightIn, int packedOverlayIn) { + setupModelFromBone2R(model, bone); + model.render(stack, buffer, packedLightIn, packedOverlayIn); + } + + public static void setupModelFromBone2R(ModelPart model, GeoBone bone) { + model.setPos(bone.getPivotX(), bone.getPivotY() + 7, bone.getPivotZ()); + model.xRot = 180 * Mth.DEG_TO_RAD; + model.yRot = 180 * Mth.DEG_TO_RAD; + model.zRot = 0; + } + public static void handleShellsAnimation(AnimationProcessor animationProcessor, float x, float y) { GeoBone shell1 = animationProcessor.getBone("shell1"); GeoBone shell2 = animationProcessor.getBone("shell2"); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/AK47Layer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/AK47Layer.java index 5e9df3e96..8ab54d820 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/AK47Layer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/AK47Layer.java @@ -16,8 +16,8 @@ public class AK47Layer extends GeoRenderLayer { private static final ResourceLocation LAYER = Mod.loc("textures/item/ak47_e.png"); - public AK47Layer(GeoRenderer entityRenderer) { - super(entityRenderer); + public AK47Layer(GeoRenderer itemGeoRenderer) { + super(itemGeoRenderer); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/AK12ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/AK12ItemRenderer.java index 4a948e1cd..32a757339 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/AK12ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/AK12ItemRenderer.java @@ -18,7 +18,6 @@ import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.entity.player.PlayerRenderer; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import software.bernie.geckolib.cache.object.BakedGeoModel; @@ -82,7 +81,7 @@ public class AK12ItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - Player player = mc.player; + var player = mc.player; if (player != null) { ItemStack itemStack = player.getMainHandItem(); if (!itemStack.is(ModTags.Items.GUN)) return; @@ -133,13 +132,7 @@ public class AK12ItemRenderer extends GeoItemRenderer { } if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer localPlayer = mc.player; - - if (localPlayer == null) { - return; - } - - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtil.translateMatrixToBone(stack, bone); @@ -147,19 +140,16 @@ public class AK12ItemRenderer extends GeoItemRenderer { RenderUtil.rotateMatrixAroundBone(stack, bone); RenderUtil.scaleMatrixForBone(stack, bone); RenderUtil.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = localPlayer.getSkin().texture(); - VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); - VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); + ResourceLocation loc = player.getSkin().texture(); if (name.equals("Lefthand")) { stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone2(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone2(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBone2(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBone2(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } else { stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone2(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone2(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBone2R(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBone2R(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } - this.currentBuffer.getBuffer(this.renderType); stack.popPose(); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/AK47ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/AK47ItemRenderer.java index 1ef4d71a6..6a7ff1edd 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/AK47ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/AK47ItemRenderer.java @@ -18,7 +18,6 @@ import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.entity.player.PlayerRenderer; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import software.bernie.geckolib.cache.object.BakedGeoModel; @@ -82,7 +81,7 @@ public class AK47ItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - Player player = mc.player; + var player = mc.player; if (player != null) { ItemStack itemStack = player.getMainHandItem(); if (!itemStack.is(ModTags.Items.GUN)) return; @@ -152,13 +151,7 @@ public class AK47ItemRenderer extends GeoItemRenderer { if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer localPlayer = mc.player; - - if (localPlayer == null) { - return; - } - - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtil.translateMatrixToBone(stack, bone); @@ -166,19 +159,16 @@ public class AK47ItemRenderer extends GeoItemRenderer { RenderUtil.rotateMatrixAroundBone(stack, bone); RenderUtil.scaleMatrixForBone(stack, bone); RenderUtil.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = localPlayer.getSkin().texture(); - VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); - VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); + ResourceLocation loc = player.getSkin().texture(); if (name.equals("Lefthand")) { stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone2(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone2(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBone2(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBone2(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } else { stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone2(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone2(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBone2R(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBone2R(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } - this.currentBuffer.getBuffer(this.renderType); stack.popPose(); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Aa12ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Aa12ItemRenderer.java index 0e32ebd2e..0ad5bea2b 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Aa12ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Aa12ItemRenderer.java @@ -17,7 +17,6 @@ import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.entity.player.PlayerRenderer; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import software.bernie.geckolib.cache.object.BakedGeoModel; @@ -81,7 +80,7 @@ public class Aa12ItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - Player player = mc.player; + var player = mc.player; if (player != null) { ItemStack itemStack = player.getMainHandItem(); if (!itemStack.is(ModTags.Items.GUN)) return; @@ -101,13 +100,7 @@ public class Aa12ItemRenderer extends GeoItemRenderer { } if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer localPlayer = mc.player; - - if (localPlayer == null) { - return; - } - - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtil.translateMatrixToBone(stack, bone); @@ -115,19 +108,16 @@ public class Aa12ItemRenderer extends GeoItemRenderer { RenderUtil.rotateMatrixAroundBone(stack, bone); RenderUtil.scaleMatrixForBone(stack, bone); RenderUtil.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = localPlayer.getSkin().texture(); - VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); - VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); + ResourceLocation loc = player.getSkin().texture(); if (name.equals("Lefthand")) { stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBone(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBone(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } else { stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBoneR(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBoneR(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } - this.currentBuffer.getBuffer(this.renderType); stack.popPose(); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/BocekItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/BocekItemRenderer.java index ece6442c4..958e501b0 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/BocekItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/BocekItemRenderer.java @@ -99,34 +99,24 @@ public class BocekItemRenderer extends GeoItemRenderer { } if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer localPlayer = mc.player; - - if (localPlayer == null) { - return; - } - - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); - RenderUtil.translateMatrixToBone(stack, bone); RenderUtil.translateToPivotPoint(stack, bone); RenderUtil.rotateMatrixAroundBone(stack, bone); RenderUtil.scaleMatrixForBone(stack, bone); RenderUtil.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = localPlayer.getSkin().texture(); - VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); - VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); + ResourceLocation loc = player.getSkin().texture(); if (name.equals("Lefthand")) { stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBone(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBone(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } else { stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBoneR(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBoneR(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } - this.currentBuffer.getBuffer(this.renderType); stack.popPose(); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/DevotionItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/DevotionItemRenderer.java index 7b128ea9b..32d474e52 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/DevotionItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/DevotionItemRenderer.java @@ -16,7 +16,6 @@ import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.entity.player.PlayerRenderer; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import software.bernie.geckolib.cache.object.BakedGeoModel; @@ -80,7 +79,7 @@ public class DevotionItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - Player player = mc.player; + var player = mc.player; if (player == null) return; ItemStack itemStack = player.getMainHandItem(); if (!itemStack.is(ModTags.Items.GUN)) return; @@ -101,13 +100,7 @@ public class DevotionItemRenderer extends GeoItemRenderer { } if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer localPlayer = mc.player; - - if (localPlayer == null) { - return; - } - - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtil.translateMatrixToBone(stack, bone); @@ -115,19 +108,16 @@ public class DevotionItemRenderer extends GeoItemRenderer { RenderUtil.rotateMatrixAroundBone(stack, bone); RenderUtil.scaleMatrixForBone(stack, bone); RenderUtil.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = localPlayer.getSkin().texture(); - VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); - VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); + ResourceLocation loc = player.getSkin().texture(); if (name.equals("Lefthand")) { stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBone(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBone(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } else { stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBoneR(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBoneR(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } - this.currentBuffer.getBuffer(this.renderType); stack.popPose(); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Glock17ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Glock17ItemRenderer.java index 25a3d8ec3..bdf56237f 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Glock17ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Glock17ItemRenderer.java @@ -15,7 +15,6 @@ import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.entity.player.PlayerRenderer; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import software.bernie.geckolib.cache.object.BakedGeoModel; @@ -81,7 +80,7 @@ public class Glock17ItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - Player player = mc.player; + var player = mc.player; if (player == null) return; ItemStack itemStack = player.getMainHandItem(); if (!itemStack.is(ModTags.Items.GUN)) return; @@ -98,13 +97,7 @@ public class Glock17ItemRenderer extends GeoItemRenderer { } if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer localPlayer = mc.player; - - if (localPlayer == null) { - return; - } - - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtil.translateMatrixToBone(stack, bone); @@ -112,19 +105,16 @@ public class Glock17ItemRenderer extends GeoItemRenderer { RenderUtil.rotateMatrixAroundBone(stack, bone); RenderUtil.scaleMatrixForBone(stack, bone); RenderUtil.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = localPlayer.getSkin().texture(); - VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); - VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); + ResourceLocation loc = player.getSkin().texture(); if (name.equals("Lefthand")) { stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone2(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone2(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBone2(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBone2(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } else { stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone2(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone2(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBone2R(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBone2R(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } - this.currentBuffer.getBuffer(this.renderType); stack.popPose(); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Glock18ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Glock18ItemRenderer.java index cefbbac5a..8086c9501 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Glock18ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Glock18ItemRenderer.java @@ -15,7 +15,6 @@ import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.entity.player.PlayerRenderer; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import software.bernie.geckolib.cache.object.BakedGeoModel; @@ -81,7 +80,7 @@ public class Glock18ItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - Player player = mc.player; + var player = mc.player; if (player == null) return; ItemStack itemStack = player.getMainHandItem(); if (!itemStack.is(ModTags.Items.GUN)) return; @@ -98,13 +97,7 @@ public class Glock18ItemRenderer extends GeoItemRenderer { } if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer localPlayer = mc.player; - - if (localPlayer == null) { - return; - } - - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtil.translateMatrixToBone(stack, bone); @@ -112,19 +105,16 @@ public class Glock18ItemRenderer extends GeoItemRenderer { RenderUtil.rotateMatrixAroundBone(stack, bone); RenderUtil.scaleMatrixForBone(stack, bone); RenderUtil.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = localPlayer.getSkin().texture(); - VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); - VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); + ResourceLocation loc = player.getSkin().texture(); if (name.equals("Lefthand")) { stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone2(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone2(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBone2(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBone2(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } else { stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone2(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone2(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBone2R(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBone2R(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } - this.currentBuffer.getBuffer(this.renderType); stack.popPose(); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Hk416ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Hk416ItemRenderer.java index 6dc0ecc7a..85e3b1f38 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Hk416ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Hk416ItemRenderer.java @@ -18,7 +18,6 @@ import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.entity.player.PlayerRenderer; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import software.bernie.geckolib.cache.object.BakedGeoModel; @@ -82,7 +81,7 @@ public class Hk416ItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - Player player = mc.player; + var player = mc.player; if (player == null) return; ItemStack itemStack = player.getMainHandItem(); if (!itemStack.is(ModTags.Items.GUN)) return; @@ -129,13 +128,7 @@ public class Hk416ItemRenderer extends GeoItemRenderer { ItemModelHelper.handleGunAttachments(bone, itemStack, name); if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer localPlayer = mc.player; - - if (localPlayer == null) { - return; - } - - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtil.translateMatrixToBone(stack, bone); @@ -143,19 +136,16 @@ public class Hk416ItemRenderer extends GeoItemRenderer { RenderUtil.rotateMatrixAroundBone(stack, bone); RenderUtil.scaleMatrixForBone(stack, bone); RenderUtil.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = localPlayer.getSkin().texture(); - VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); - VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); + ResourceLocation loc = player.getSkin().texture(); if (name.equals("Lefthand")) { stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone2(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone2(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBone2(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBone2(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } else { stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone2(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone2(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBone2R(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBone2R(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } - this.currentBuffer.getBuffer(this.renderType); stack.popPose(); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/HomemadeShotgunItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/HomemadeShotgunItemRenderer.java index aea93f1c9..dfaaf7255 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/HomemadeShotgunItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/HomemadeShotgunItemRenderer.java @@ -15,7 +15,6 @@ import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.entity.player.PlayerRenderer; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import software.bernie.geckolib.cache.object.BakedGeoModel; @@ -79,7 +78,7 @@ public class HomemadeShotgunItemRenderer extends GeoItemRenderer model = playerRenderer.getModel(); stack.pushPose(); RenderUtil.translateMatrixToBone(stack, bone); @@ -111,19 +104,16 @@ public class HomemadeShotgunItemRenderer extends GeoItemRenderer bone.setHidden(this.hiddenBones.contains(name)); } - Player player = mc.player; + var player = mc.player; if (player == null) return; ItemStack itemStack = player.getMainHandItem(); if (!itemStack.is(ModTags.Items.GUN)) return; @@ -96,13 +95,7 @@ public class HuntingRifleItemRenderer extends GeoItemRenderer } if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer localPlayer = mc.player; - - if (localPlayer == null) { - return; - } - - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtil.translateMatrixToBone(stack, bone); @@ -110,19 +103,16 @@ public class HuntingRifleItemRenderer extends GeoItemRenderer RenderUtil.rotateMatrixAroundBone(stack, bone); RenderUtil.scaleMatrixForBone(stack, bone); RenderUtil.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = localPlayer.getSkin().texture(); - VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); - VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); + ResourceLocation loc = player.getSkin().texture(); if (name.equals("Lefthand")) { stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBone(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBone(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } else { stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBoneR(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBoneR(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } - this.currentBuffer.getBuffer(this.renderType); stack.popPose(); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/K98ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/K98ItemRenderer.java index 69257424c..864a7a35f 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/K98ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/K98ItemRenderer.java @@ -15,7 +15,6 @@ import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.entity.player.PlayerRenderer; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import software.bernie.geckolib.cache.object.BakedGeoModel; @@ -79,7 +78,7 @@ public class K98ItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - Player player = mc.player; + var player = mc.player; if (player == null) return; ItemStack itemStack = player.getMainHandItem(); if (!itemStack.is(ModTags.Items.GUN)) return; @@ -96,13 +95,7 @@ public class K98ItemRenderer extends GeoItemRenderer { } if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer localPlayer = mc.player; - - if (localPlayer == null) { - return; - } - - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtil.translateMatrixToBone(stack, bone); @@ -110,19 +103,16 @@ public class K98ItemRenderer extends GeoItemRenderer { RenderUtil.rotateMatrixAroundBone(stack, bone); RenderUtil.scaleMatrixForBone(stack, bone); RenderUtil.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = localPlayer.getSkin().texture(); - VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); - VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); + ResourceLocation loc = player.getSkin().texture(); if (name.equals("Lefthand")) { stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBone(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBone(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } else { stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBoneR(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBoneR(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } - this.currentBuffer.getBuffer(this.renderType); stack.popPose(); } 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 b0b0fc821..62dbaca5b 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 @@ -74,14 +74,11 @@ public class LungeMineRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } + var player = mc.player; + if (player == null) return; + if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer localPlayer = mc.player; - - if (localPlayer == null) { - return; - } - - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtil.translateMatrixToBone(stack, bone); @@ -89,19 +86,16 @@ public class LungeMineRenderer extends GeoItemRenderer { RenderUtil.rotateMatrixAroundBone(stack, bone); RenderUtil.scaleMatrixForBone(stack, bone); RenderUtil.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = localPlayer.getSkin().texture(); - VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); - VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); + ResourceLocation loc = player.getSkin().texture(); if (name.equals("Lefthand")) { stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone2(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone2(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBone(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBone(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } else { stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone2(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone2(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBoneR(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBoneR(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } - this.currentBuffer.getBuffer(this.renderType); stack.popPose(); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M1911ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M1911ItemRenderer.java index c2a7ee5d2..d4de53a0c 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M1911ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M1911ItemRenderer.java @@ -15,7 +15,6 @@ import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.entity.player.PlayerRenderer; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import software.bernie.geckolib.cache.object.BakedGeoModel; @@ -79,7 +78,7 @@ public class M1911ItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - Player player = mc.player; + var player = mc.player; if (player == null) return; ItemStack itemStack = player.getMainHandItem(); if (!itemStack.is(ModTags.Items.GUN)) return; @@ -96,13 +95,7 @@ public class M1911ItemRenderer extends GeoItemRenderer { } if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer localPlayer = mc.player; - - if (localPlayer == null) { - return; - } - - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtil.translateMatrixToBone(stack, bone); @@ -110,19 +103,16 @@ public class M1911ItemRenderer extends GeoItemRenderer { RenderUtil.rotateMatrixAroundBone(stack, bone); RenderUtil.scaleMatrixForBone(stack, bone); RenderUtil.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = localPlayer.getSkin().texture(); - VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); - VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); + ResourceLocation loc = player.getSkin().texture(); if (name.equals("Lefthand")) { stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone2(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone2(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBone2(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBone2(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } else { stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone2(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone2(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBone2R(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBone2R(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } - this.currentBuffer.getBuffer(this.renderType); stack.popPose(); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M4ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M4ItemRenderer.java index c5bdc0f62..b5c04d7a9 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M4ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M4ItemRenderer.java @@ -18,7 +18,6 @@ import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.entity.player.PlayerRenderer; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import software.bernie.geckolib.cache.object.BakedGeoModel; @@ -82,7 +81,7 @@ public class M4ItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - Player player = mc.player; + var player = mc.player; if (player == null) return; ItemStack itemStack = player.getMainHandItem(); if (!itemStack.is(ModTags.Items.GUN)) return; @@ -140,13 +139,7 @@ public class M4ItemRenderer extends GeoItemRenderer { ItemModelHelper.handleGunAttachments(bone, itemStack, name); if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer localPlayer = mc.player; - - if (localPlayer == null) { - return; - } - - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtil.translateMatrixToBone(stack, bone); @@ -154,19 +147,16 @@ public class M4ItemRenderer extends GeoItemRenderer { RenderUtil.rotateMatrixAroundBone(stack, bone); RenderUtil.scaleMatrixForBone(stack, bone); RenderUtil.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = localPlayer.getSkin().texture(); - VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); - VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); + ResourceLocation loc = player.getSkin().texture(); if (name.equals("Lefthand")) { stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone2(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone2(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBone2(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBone2(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } else { stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone2(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone2(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBone2R(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBone2R(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } - this.currentBuffer.getBuffer(this.renderType); stack.popPose(); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M60ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M60ItemRenderer.java index b8305dd37..7db99b9d5 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M60ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M60ItemRenderer.java @@ -15,7 +15,6 @@ import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.entity.player.PlayerRenderer; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import software.bernie.geckolib.cache.object.BakedGeoModel; @@ -79,7 +78,7 @@ public class M60ItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - Player player = mc.player; + var player = mc.player; if (player == null) return; ItemStack itemStack = player.getMainHandItem(); if (!itemStack.is(ModTags.Items.GUN)) return; @@ -96,13 +95,7 @@ public class M60ItemRenderer extends GeoItemRenderer { } if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer localPlayer = mc.player; - - if (localPlayer == null) { - return; - } - - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtil.translateMatrixToBone(stack, bone); @@ -110,19 +103,16 @@ public class M60ItemRenderer extends GeoItemRenderer { RenderUtil.rotateMatrixAroundBone(stack, bone); RenderUtil.scaleMatrixForBone(stack, bone); RenderUtil.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = localPlayer.getSkin().texture(); - VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); - VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); + ResourceLocation loc = player.getSkin().texture(); if (name.equals("Lefthand")) { stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBone(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBone(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } else { stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBoneR(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBoneR(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } - this.currentBuffer.getBuffer(this.renderType); stack.popPose(); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M79ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M79ItemRenderer.java index cc8ee4b61..05fe0d4be 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M79ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M79ItemRenderer.java @@ -15,7 +15,6 @@ import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.entity.player.PlayerRenderer; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import software.bernie.geckolib.cache.object.BakedGeoModel; @@ -79,7 +78,7 @@ public class M79ItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - Player player = mc.player; + var player = mc.player; if (player == null) return; ItemStack itemStack = player.getMainHandItem(); if (!itemStack.is(ModTags.Items.GUN)) return; @@ -96,13 +95,7 @@ public class M79ItemRenderer extends GeoItemRenderer { } if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer localPlayer = mc.player; - - if (localPlayer == null) { - return; - } - - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtil.translateMatrixToBone(stack, bone); @@ -110,19 +103,16 @@ public class M79ItemRenderer extends GeoItemRenderer { RenderUtil.rotateMatrixAroundBone(stack, bone); RenderUtil.scaleMatrixForBone(stack, bone); RenderUtil.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = localPlayer.getSkin().texture(); - VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); - VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); + ResourceLocation loc = player.getSkin().texture(); if (name.equals("Lefthand")) { stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBone(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBone(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } else { stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBoneR(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBoneR(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } - this.currentBuffer.getBuffer(this.renderType); stack.popPose(); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M870ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M870ItemRenderer.java index 9d210d56f..96d692d17 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M870ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M870ItemRenderer.java @@ -15,7 +15,6 @@ import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.entity.player.PlayerRenderer; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import software.bernie.geckolib.cache.object.BakedGeoModel; @@ -79,7 +78,7 @@ public class M870ItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - Player player = mc.player; + var player = mc.player; if (player == null) return; ItemStack itemStack = player.getMainHandItem(); if (!itemStack.is(ModTags.Items.GUN)) return; @@ -96,13 +95,7 @@ public class M870ItemRenderer extends GeoItemRenderer { } if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer localPlayer = mc.player; - - if (localPlayer == null) { - return; - } - - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtil.translateMatrixToBone(stack, bone); @@ -110,19 +103,16 @@ public class M870ItemRenderer extends GeoItemRenderer { RenderUtil.rotateMatrixAroundBone(stack, bone); RenderUtil.scaleMatrixForBone(stack, bone); RenderUtil.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = localPlayer.getSkin().texture(); - VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); - VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); + ResourceLocation loc = player.getSkin().texture(); if (name.equals("Lefthand")) { stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBone(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBone(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } else { stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBoneR(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBoneR(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } - this.currentBuffer.getBuffer(this.renderType); stack.popPose(); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M98bItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M98bItemRenderer.java index 8b0813772..4a80cae77 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M98bItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M98bItemRenderer.java @@ -16,7 +16,6 @@ import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.entity.player.PlayerRenderer; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import software.bernie.geckolib.cache.object.BakedGeoModel; @@ -80,7 +79,7 @@ public class M98bItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - Player player = mc.player; + var player = mc.player; if (player == null) return; ItemStack itemStack = player.getMainHandItem(); if (!itemStack.is(ModTags.Items.GUN)) return; @@ -105,13 +104,7 @@ public class M98bItemRenderer extends GeoItemRenderer { } if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer localPlayer = mc.player; - - if (localPlayer == null) { - return; - } - - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtil.translateMatrixToBone(stack, bone); @@ -119,19 +112,16 @@ public class M98bItemRenderer extends GeoItemRenderer { RenderUtil.rotateMatrixAroundBone(stack, bone); RenderUtil.scaleMatrixForBone(stack, bone); RenderUtil.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = localPlayer.getSkin().texture(); - VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); - VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); + ResourceLocation loc = player.getSkin().texture(); if (name.equals("Lefthand")) { stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBone(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBone(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } else { stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBoneR(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBoneR(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } - this.currentBuffer.getBuffer(this.renderType); stack.popPose(); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/MarlinItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/MarlinItemRenderer.java index 95cf95148..6efd84bbb 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/MarlinItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/MarlinItemRenderer.java @@ -15,7 +15,6 @@ import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.entity.player.PlayerRenderer; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import software.bernie.geckolib.cache.object.BakedGeoModel; @@ -79,7 +78,7 @@ public class MarlinItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - Player player = mc.player; + var player = mc.player; if (player == null) return; ItemStack itemStack = player.getMainHandItem(); if (!itemStack.is(ModTags.Items.GUN)) return; @@ -96,13 +95,7 @@ public class MarlinItemRenderer extends GeoItemRenderer { } if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer localPlayer = mc.player; - - if (localPlayer == null) { - return; - } - - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtil.translateMatrixToBone(stack, bone); @@ -110,19 +103,16 @@ public class MarlinItemRenderer extends GeoItemRenderer { RenderUtil.rotateMatrixAroundBone(stack, bone); RenderUtil.scaleMatrixForBone(stack, bone); RenderUtil.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = localPlayer.getSkin().texture(); - VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); - VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); + ResourceLocation loc = player.getSkin().texture(); if (name.equals("Lefthand")) { stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBone(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBone(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } else { stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBoneR(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBoneR(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } - this.currentBuffer.getBuffer(this.renderType); stack.popPose(); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/MinigunItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/MinigunItemRenderer.java index 1d7070227..7b031be4d 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/MinigunItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/MinigunItemRenderer.java @@ -15,7 +15,6 @@ import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.entity.player.PlayerRenderer; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import software.bernie.geckolib.cache.object.BakedGeoModel; @@ -81,7 +80,7 @@ public class MinigunItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - Player player = mc.player; + var player = mc.player; if (player == null) return; ItemStack itemStack = player.getMainHandItem(); if (!itemStack.is(ModTags.Items.GUN)) return; @@ -98,13 +97,7 @@ public class MinigunItemRenderer extends GeoItemRenderer { } if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer localPlayer = mc.player; - - if (localPlayer == null) { - return; - } - - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtil.translateMatrixToBone(stack, bone); @@ -112,19 +105,16 @@ public class MinigunItemRenderer extends GeoItemRenderer { RenderUtil.rotateMatrixAroundBone(stack, bone); RenderUtil.scaleMatrixForBone(stack, bone); RenderUtil.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = localPlayer.getSkin().texture(); - VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); - VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); + ResourceLocation loc = player.getSkin().texture(); if (name.equals("Lefthand")) { stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBone(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBone(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } else { stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBoneR(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBoneR(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } - this.currentBuffer.getBuffer(this.renderType); stack.popPose(); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Mk14ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Mk14ItemRenderer.java index 718f5cce5..deb584c46 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Mk14ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Mk14ItemRenderer.java @@ -18,7 +18,6 @@ import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.entity.player.PlayerRenderer; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import software.bernie.geckolib.cache.object.BakedGeoModel; @@ -82,7 +81,7 @@ public class Mk14ItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - Player player = mc.player; + var player = mc.player; if (player == null) return; ItemStack itemStack = player.getMainHandItem(); if (!itemStack.is(ModTags.Items.GUN)) return; @@ -133,13 +132,7 @@ public class Mk14ItemRenderer extends GeoItemRenderer { ItemModelHelper.handleGunAttachments(bone, itemStack, name); if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer localPlayer = mc.player; - - if (localPlayer == null) { - return; - } - - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtil.translateMatrixToBone(stack, bone); @@ -147,19 +140,16 @@ public class Mk14ItemRenderer extends GeoItemRenderer { RenderUtil.rotateMatrixAroundBone(stack, bone); RenderUtil.scaleMatrixForBone(stack, bone); RenderUtil.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = localPlayer.getSkin().texture(); - VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); - VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); + ResourceLocation loc = player.getSkin().texture(); if (name.equals("Lefthand")) { stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBone(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBone(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } else { stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBoneR(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBoneR(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } - this.currentBuffer.getBuffer(this.renderType); stack.popPose(); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/MosinNagantItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/MosinNagantItemRenderer.java index ceba03ee4..592f40c13 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/MosinNagantItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/MosinNagantItemRenderer.java @@ -16,7 +16,6 @@ import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.entity.player.PlayerRenderer; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import software.bernie.geckolib.cache.object.BakedGeoModel; @@ -80,7 +79,7 @@ public class MosinNagantItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - Player player = mc.player; + var player = mc.player; if (player == null) return; ItemStack itemStack = player.getMainHandItem(); if (!itemStack.is(ModTags.Items.GUN)) return; @@ -105,13 +104,7 @@ public class MosinNagantItemRenderer extends GeoItemRenderer { } if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer localPlayer = mc.player; - - if (localPlayer == null) { - return; - } - - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtil.translateMatrixToBone(stack, bone); @@ -119,19 +112,16 @@ public class MosinNagantItemRenderer extends GeoItemRenderer { RenderUtil.rotateMatrixAroundBone(stack, bone); RenderUtil.scaleMatrixForBone(stack, bone); RenderUtil.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = localPlayer.getSkin().texture(); - VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); - VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); + ResourceLocation loc = player.getSkin().texture(); if (name.equals("Lefthand")) { stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBone(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBone(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } else { stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBoneR(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBoneR(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } - this.currentBuffer.getBuffer(this.renderType); stack.popPose(); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Mp443ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Mp443ItemRenderer.java index b869567b4..d216e583a 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Mp443ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Mp443ItemRenderer.java @@ -15,7 +15,6 @@ import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.entity.player.PlayerRenderer; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import software.bernie.geckolib.cache.object.BakedGeoModel; @@ -81,7 +80,7 @@ public class Mp443ItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - Player player = mc.player; + var player = mc.player; if (player == null) return; ItemStack itemStack = player.getMainHandItem(); if (!itemStack.is(ModTags.Items.GUN)) return; @@ -98,13 +97,7 @@ public class Mp443ItemRenderer extends GeoItemRenderer { } if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer localPlayer = mc.player; - - if (localPlayer == null) { - return; - } - - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtil.translateMatrixToBone(stack, bone); @@ -112,19 +105,16 @@ public class Mp443ItemRenderer extends GeoItemRenderer { RenderUtil.rotateMatrixAroundBone(stack, bone); RenderUtil.scaleMatrixForBone(stack, bone); RenderUtil.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = localPlayer.getSkin().texture(); - VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); - VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); + ResourceLocation loc = player.getSkin().texture(); if (name.equals("Lefthand")) { stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone2(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone2(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBone2(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBone2(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } else { stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone2(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone2(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBone2R(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBone2R(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } - this.currentBuffer.getBuffer(this.renderType); stack.popPose(); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Ntw20Renderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Ntw20Renderer.java index 7e8212a12..bf8274895 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Ntw20Renderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Ntw20Renderer.java @@ -18,7 +18,6 @@ import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.entity.player.PlayerRenderer; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import software.bernie.geckolib.cache.object.BakedGeoModel; @@ -82,7 +81,7 @@ public class Ntw20Renderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - Player player = mc.player; + var player = mc.player; if (player == null) return; ItemStack itemStack = player.getMainHandItem(); if (!itemStack.is(ModTags.Items.GUN)) return; @@ -133,13 +132,7 @@ public class Ntw20Renderer extends GeoItemRenderer { ItemModelHelper.handleGunAttachments(bone, itemStack, name); if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer localPlayer = mc.player; - - if (localPlayer == null) { - return; - } - - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtil.translateMatrixToBone(stack, bone); @@ -147,19 +140,16 @@ public class Ntw20Renderer extends GeoItemRenderer { RenderUtil.rotateMatrixAroundBone(stack, bone); RenderUtil.scaleMatrixForBone(stack, bone); RenderUtil.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = localPlayer.getSkin().texture(); - VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); - VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); + ResourceLocation loc = player.getSkin().texture(); if (name.equals("Lefthand")) { stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone2(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone2(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBone2(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBone2(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } else { stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone2(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone2(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBone2R(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBone2R(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } - this.currentBuffer.getBuffer(this.renderType); stack.popPose(); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Qbz95ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Qbz95ItemRenderer.java index 26254fea9..7268a795e 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Qbz95ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Qbz95ItemRenderer.java @@ -18,7 +18,6 @@ import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.entity.player.PlayerRenderer; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import software.bernie.geckolib.cache.object.BakedGeoModel; @@ -82,7 +81,7 @@ public class Qbz95ItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - Player player = mc.player; + var player = mc.player; if (player == null) return; ItemStack itemStack = player.getMainHandItem(); if (!itemStack.is(ModTags.Items.GUN)) return; @@ -141,13 +140,7 @@ public class Qbz95ItemRenderer extends GeoItemRenderer { ItemModelHelper.handleGunAttachments(bone, itemStack, name); if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer localPlayer = mc.player; - - if (localPlayer == null) { - return; - } - - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtil.translateMatrixToBone(stack, bone); @@ -155,19 +148,16 @@ public class Qbz95ItemRenderer extends GeoItemRenderer { RenderUtil.rotateMatrixAroundBone(stack, bone); RenderUtil.scaleMatrixForBone(stack, bone); RenderUtil.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = localPlayer.getSkin().texture(); - VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); - VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); + ResourceLocation loc = player.getSkin().texture(); if (name.equals("Lefthand")) { stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBone(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBone(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } else { stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBoneR(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBoneR(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } - this.currentBuffer.getBuffer(this.renderType); stack.popPose(); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/RpgItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/RpgItemRenderer.java index cb9df49dd..dee4c52c3 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/RpgItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/RpgItemRenderer.java @@ -16,7 +16,6 @@ import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.entity.player.PlayerRenderer; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import software.bernie.geckolib.cache.object.BakedGeoModel; @@ -78,7 +77,7 @@ public class RpgItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - Player player = mc.player; + var player = mc.player; if (player == null) return; ItemStack itemStack = player.getMainHandItem(); if (!itemStack.is(ModTags.Items.GUN)) return; @@ -99,13 +98,7 @@ public class RpgItemRenderer extends GeoItemRenderer { } if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer localPlayer = mc.player; - - if (localPlayer == null) { - return; - } - - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtil.translateMatrixToBone(stack, bone); @@ -113,19 +106,16 @@ public class RpgItemRenderer extends GeoItemRenderer { RenderUtil.rotateMatrixAroundBone(stack, bone); RenderUtil.scaleMatrixForBone(stack, bone); RenderUtil.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = localPlayer.getSkin().texture(); - VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); - VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); + ResourceLocation loc = player.getSkin().texture(); if (name.equals("Lefthand")) { stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone2(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone2(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBone2(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBone2(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } else { stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone2(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone2(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBone2R(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBone2R(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } - this.currentBuffer.getBuffer(this.renderType); stack.popPose(); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/RpkItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/RpkItemRenderer.java index d9cd04645..a3f300e43 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/RpkItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/RpkItemRenderer.java @@ -16,7 +16,6 @@ import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.entity.player.PlayerRenderer; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import software.bernie.geckolib.cache.object.BakedGeoModel; @@ -80,7 +79,7 @@ public class RpkItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - Player player = mc.player; + var player = mc.player; if (player == null) return; ItemStack itemStack = player.getMainHandItem(); if (!itemStack.is(ModTags.Items.GUN)) return; @@ -101,13 +100,7 @@ public class RpkItemRenderer extends GeoItemRenderer { } if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer localPlayer = mc.player; - - if (localPlayer == null) { - return; - } - - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtil.translateMatrixToBone(stack, bone); @@ -115,19 +108,16 @@ public class RpkItemRenderer extends GeoItemRenderer { RenderUtil.rotateMatrixAroundBone(stack, bone); RenderUtil.scaleMatrixForBone(stack, bone); RenderUtil.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = localPlayer.getSkin().texture(); - VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); - VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); + ResourceLocation loc = player.getSkin().texture(); if (name.equals("Lefthand")) { stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBone(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBone(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } else { stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBoneR(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBoneR(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } - this.currentBuffer.getBuffer(this.renderType); stack.popPose(); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/SecondaryCataclysmRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/SecondaryCataclysmRenderer.java index 52bed63bf..ef84dc112 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/SecondaryCataclysmRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/SecondaryCataclysmRenderer.java @@ -15,7 +15,6 @@ import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.entity.player.PlayerRenderer; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import software.bernie.geckolib.cache.object.BakedGeoModel; @@ -79,7 +78,7 @@ public class SecondaryCataclysmRenderer extends GeoItemRenderer model = playerRenderer.getModel(); stack.pushPose(); RenderUtil.translateMatrixToBone(stack, bone); @@ -110,19 +103,16 @@ public class SecondaryCataclysmRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - Player player = mc.player; + var player = mc.player; if (player == null) return; ItemStack itemStack = player.getMainHandItem(); if (!itemStack.is(ModTags.Items.GUN)) return; @@ -111,13 +110,7 @@ public class SentinelItemRenderer extends GeoItemRenderer { } if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer localPlayer = mc.player; - - if (localPlayer == null) { - return; - } - - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtil.translateMatrixToBone(stack, bone); @@ -125,19 +118,16 @@ public class SentinelItemRenderer extends GeoItemRenderer { RenderUtil.rotateMatrixAroundBone(stack, bone); RenderUtil.scaleMatrixForBone(stack, bone); RenderUtil.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = localPlayer.getSkin().texture(); - VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); - VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); + ResourceLocation loc = player.getSkin().texture(); if (name.equals("Lefthand")) { stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBone(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBone(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } else { stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBoneR(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBoneR(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } - this.currentBuffer.getBuffer(this.renderType); stack.popPose(); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/SksItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/SksItemRenderer.java index f30df536e..a7ff19a04 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/SksItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/SksItemRenderer.java @@ -16,7 +16,6 @@ import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.entity.player.PlayerRenderer; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import software.bernie.geckolib.cache.object.BakedGeoModel; @@ -80,7 +79,7 @@ public class SksItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - Player player = mc.player; + var player = mc.player; if (player == null) return; ItemStack itemStack = player.getMainHandItem(); if (!itemStack.is(ModTags.Items.GUN)) return; @@ -101,13 +100,7 @@ public class SksItemRenderer extends GeoItemRenderer { } if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer localPlayer = mc.player; - - if (localPlayer == null) { - return; - } - - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtil.translateMatrixToBone(stack, bone); @@ -115,19 +108,16 @@ public class SksItemRenderer extends GeoItemRenderer { RenderUtil.rotateMatrixAroundBone(stack, bone); RenderUtil.scaleMatrixForBone(stack, bone); RenderUtil.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = localPlayer.getSkin().texture(); - VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); - VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); + ResourceLocation loc = player.getSkin().texture(); if (name.equals("Lefthand")) { stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBone(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBone(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } else { stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBoneR(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBoneR(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } - this.currentBuffer.getBuffer(this.renderType); stack.popPose(); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/SvdItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/SvdItemRenderer.java index 7dd0732eb..6d9566e75 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/SvdItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/SvdItemRenderer.java @@ -18,7 +18,6 @@ import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.entity.player.PlayerRenderer; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import software.bernie.geckolib.cache.object.BakedGeoModel; @@ -82,7 +81,7 @@ public class SvdItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - Player player = mc.player; + var player = mc.player; if (player == null) return; ItemStack itemStack = player.getMainHandItem(); if (!itemStack.is(ModTags.Items.GUN)) return; @@ -126,13 +125,7 @@ public class SvdItemRenderer extends GeoItemRenderer { ItemModelHelper.handleGunAttachments(bone, itemStack, name); if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer localPlayer = mc.player; - - if (localPlayer == null) { - return; - } - - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtil.translateMatrixToBone(stack, bone); @@ -140,19 +133,16 @@ public class SvdItemRenderer extends GeoItemRenderer { RenderUtil.rotateMatrixAroundBone(stack, bone); RenderUtil.scaleMatrixForBone(stack, bone); RenderUtil.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = localPlayer.getSkin().texture(); - VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); - VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); + ResourceLocation loc = player.getSkin().texture(); if (name.equals("Lefthand")) { stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone2(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone2(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBone2(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBone2(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } else { stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone2(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone2(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBone2R(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBone2R(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } - this.currentBuffer.getBuffer(this.renderType); stack.popPose(); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/TaserItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/TaserItemRenderer.java index 5e89f62de..e6d8588e5 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/TaserItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/TaserItemRenderer.java @@ -14,7 +14,6 @@ import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.entity.player.PlayerRenderer; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import software.bernie.geckolib.cache.object.BakedGeoModel; @@ -76,19 +75,13 @@ public class TaserItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - Player player = mc.player; + var player = mc.player; if (player == null) return; ItemStack itemStack = player.getMainHandItem(); if (!itemStack.is(ModTags.Items.GUN)) return; if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer localPlayer = mc.player; - - if (localPlayer == null) { - return; - } - - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtil.translateMatrixToBone(stack, bone); @@ -96,19 +89,16 @@ public class TaserItemRenderer extends GeoItemRenderer { RenderUtil.rotateMatrixAroundBone(stack, bone); RenderUtil.scaleMatrixForBone(stack, bone); RenderUtil.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = localPlayer.getSkin().texture(); - VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); - VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); + ResourceLocation loc = player.getSkin().texture(); if (name.equals("Lefthand")) { stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone2(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone2(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBone2(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBone2(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } else { stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone2(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone2(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBone2R(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBone2R(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } - this.currentBuffer.getBuffer(this.renderType); stack.popPose(); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/TracheliumItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/TracheliumItemRenderer.java index e4a6b86d8..de1b815ae 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/TracheliumItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/TracheliumItemRenderer.java @@ -18,7 +18,6 @@ import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.entity.player.PlayerRenderer; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import software.bernie.geckolib.cache.object.BakedGeoModel; @@ -84,7 +83,7 @@ public class TracheliumItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - Player player = mc.player; + var player = mc.player; if (player == null) return; ItemStack itemStack = player.getMainHandItem(); if (!itemStack.is(ModTags.Items.GUN)) return; @@ -143,13 +142,7 @@ public class TracheliumItemRenderer extends GeoItemRenderer { } if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer localPlayer = mc.player; - - if (localPlayer == null) { - return; - } - - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); RenderUtil.translateMatrixToBone(stack, bone); @@ -157,19 +150,16 @@ public class TracheliumItemRenderer extends GeoItemRenderer { RenderUtil.rotateMatrixAroundBone(stack, bone); RenderUtil.scaleMatrixForBone(stack, bone); RenderUtil.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = localPlayer.getSkin().texture(); - VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); - VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); + ResourceLocation loc = player.getSkin().texture(); if (name.equals("Lefthand")) { stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBone(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBone(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } else { stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBoneR(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBoneR(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } - this.currentBuffer.getBuffer(this.renderType); stack.popPose(); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/VectorItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/VectorItemRenderer.java index 834834095..b7b7182ef 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/VectorItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/VectorItemRenderer.java @@ -90,14 +90,16 @@ public class VectorItemRenderer extends GeoItemRenderer { ItemStack itemStack = player.getMainHandItem(); if (!itemStack.is(ModTags.Items.GUN)) return; + var tag = NBTTool.getTag(itemStack); + if (name.equals("Cross1")) { - bone.setHidden(NBTTool.getTag(itemStack).getBoolean("HoloHidden") + bone.setHidden(tag.getBoolean("HoloHidden") || !ClientEventHandler.zoom || GunsTool.getAttachmentType(itemStack, GunsTool.AttachmentType.SCOPE) != 1); } if (name.equals("Cross2")) { - bone.setHidden(NBTTool.getTag(itemStack).getBoolean("HoloHidden") + bone.setHidden(tag.getBoolean("HoloHidden") || !ClientEventHandler.zoom || GunsTool.getAttachmentType(itemStack, GunsTool.AttachmentType.SCOPE) != 2); } @@ -121,34 +123,24 @@ public class VectorItemRenderer extends GeoItemRenderer { if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer localPlayer = mc.player; - - if (localPlayer == null) { - return; - } - - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); + PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); - RenderUtil.translateMatrixToBone(stack, bone); RenderUtil.translateToPivotPoint(stack, bone); RenderUtil.rotateMatrixAroundBone(stack, bone); RenderUtil.scaleMatrixForBone(stack, bone); RenderUtil.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = localPlayer.getSkin().texture(); - VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); - VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); + ResourceLocation loc = player.getSkin().texture(); if (name.equals("Lefthand")) { stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBone(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBone(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } else { stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimationHelper.renderPartOverBone(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); - AnimationHelper.renderPartOverBone(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); + AnimationHelper.renderPartOverBoneR(model.leftArm, bone, stack, this.currentBuffer.getBuffer(RenderType.entitySolid(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); + AnimationHelper.renderPartOverBoneR(model.leftSleeve, bone, stack, this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)), packedLightIn, OverlayTexture.NO_OVERLAY); } - this.currentBuffer.getBuffer(this.renderType); stack.popPose(); }