From 0c24e5f66864eabc17b6490a8816cca4916fffeb Mon Sep 17 00:00:00 2001 From: Light_Quanta Date: Sat, 5 Jul 2025 11:16:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E5=8F=96=E9=83=A8=E5=88=86=E7=AE=80?= =?UTF-8?q?=E6=98=93GunRenderer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/GunRendererBuilder.java | 33 ++++++++++++ ...emRenderer.java => SimpleGunRenderer.java} | 34 +++++++++---- .../client/renderer/gun/Aa12ItemRenderer.java | 48 ----------------- .../renderer/gun/AureliaSceptreRenderer.java | 47 ----------------- .../renderer/gun/Glock17ItemRenderer.java | 50 ------------------ .../renderer/gun/Glock18ItemRenderer.java | 50 ------------------ .../gun/HomemadeShotgunItemRenderer.java | 51 ------------------- .../gun/HuntingRifleItemRenderer.java | 51 ------------------- .../client/renderer/gun/K98ItemRenderer.java | 51 ------------------- .../renderer/gun/M1911ItemRenderer.java | 50 ------------------ .../client/renderer/gun/M60ItemRenderer.java | 51 ------------------- .../client/renderer/gun/M79ItemRenderer.java | 51 ------------------- .../client/renderer/gun/M870ItemRenderer.java | 51 ------------------- .../renderer/gun/MarlinItemRenderer.java | 51 ------------------- .../renderer/gun/Mp443ItemRenderer.java | 50 ------------------ .../client/renderer/gun/RpgItemRenderer.java | 51 ------------------- .../gun/SecondaryCataclysmRenderer.java | 51 ------------------- .../item/CustomRendererItem.java | 2 +- .../item/gun/handgun/AureliaSceptre.java | 7 +-- .../item/gun/handgun/Glock17Item.java | 7 +-- .../item/gun/handgun/Glock18Item.java | 7 +-- .../item/gun/handgun/M1911Item.java | 7 +-- .../item/gun/handgun/Mp443Item.java | 7 +-- .../item/gun/handgun/Trachelium.java | 2 +- .../item/gun/heavy/Ntw20Item.java | 2 +- .../item/gun/launcher/JavelinItem.java | 2 +- .../item/gun/launcher/M79Item.java | 7 +-- .../item/gun/launcher/RpgItem.java | 7 +-- .../item/gun/launcher/SecondaryCataclysm.java | 7 +-- .../item/gun/machinegun/DevotionItem.java | 2 +- .../item/gun/machinegun/M2HBItem.java | 7 +-- .../item/gun/machinegun/M60Item.java | 7 +-- .../item/gun/machinegun/MinigunItem.java | 2 +- .../item/gun/machinegun/RpkItem.java | 2 +- .../item/gun/rifle/AK12Item.java | 2 +- .../item/gun/rifle/AK47Item.java | 2 +- .../item/gun/rifle/Hk416Item.java | 2 +- .../item/gun/rifle/InsidiousItem.java | 2 +- .../superbwarfare/item/gun/rifle/M4Item.java | 2 +- .../item/gun/rifle/MarlinItem.java | 7 +-- .../item/gun/rifle/Mk14Item.java | 2 +- .../item/gun/rifle/Qbz95Item.java | 2 +- .../superbwarfare/item/gun/rifle/SksItem.java | 2 +- .../item/gun/shotgun/Aa12Item.java | 7 +-- .../item/gun/shotgun/HomemadeShotgunItem.java | 7 +-- .../item/gun/shotgun/M870Item.java | 7 +-- .../superbwarfare/item/gun/smg/Mp5Item.java | 2 +- .../item/gun/smg/VectorItem.java | 2 +- .../item/gun/sniper/HuntingRifleItem.java | 7 +-- .../item/gun/sniper/K98Item.java | 7 +-- .../item/gun/sniper/M98bItem.java | 2 +- .../item/gun/sniper/MosinNagantItem.java | 2 +- .../item/gun/sniper/SentinelItem.java | 2 +- .../item/gun/sniper/SvdItem.java | 2 +- .../item/gun/special/BocekItem.java | 2 +- .../item/gun/special/TaserItem.java | 2 +- 56 files changed, 143 insertions(+), 836 deletions(-) create mode 100644 src/main/java/com/atsuishio/superbwarfare/client/GunRendererBuilder.java rename src/main/java/com/atsuishio/superbwarfare/client/renderer/{gun/M2HBItemRenderer.java => SimpleGunRenderer.java} (51%) delete mode 100644 src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Aa12ItemRenderer.java delete mode 100644 src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/AureliaSceptreRenderer.java delete mode 100644 src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Glock17ItemRenderer.java delete mode 100644 src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Glock18ItemRenderer.java delete mode 100644 src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/HomemadeShotgunItemRenderer.java delete mode 100644 src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/HuntingRifleItemRenderer.java delete mode 100644 src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/K98ItemRenderer.java delete mode 100644 src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M1911ItemRenderer.java delete mode 100644 src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M60ItemRenderer.java delete mode 100644 src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M79ItemRenderer.java delete mode 100644 src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M870ItemRenderer.java delete mode 100644 src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/MarlinItemRenderer.java delete mode 100644 src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Mp443ItemRenderer.java delete mode 100644 src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/RpgItemRenderer.java delete mode 100644 src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/SecondaryCataclysmRenderer.java diff --git a/src/main/java/com/atsuishio/superbwarfare/client/GunRendererBuilder.java b/src/main/java/com/atsuishio/superbwarfare/client/GunRendererBuilder.java new file mode 100644 index 000000000..b2510103a --- /dev/null +++ b/src/main/java/com/atsuishio/superbwarfare/client/GunRendererBuilder.java @@ -0,0 +1,33 @@ +package com.atsuishio.superbwarfare.client; + +import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; +import com.atsuishio.superbwarfare.client.renderer.SimpleGunRenderer; +import com.atsuishio.superbwarfare.item.gun.GunItem; +import software.bernie.geckolib.animatable.GeoAnimatable; +import software.bernie.geckolib.model.GeoModel; + +import java.util.function.Supplier; + +public class GunRendererBuilder { + + public static Supplier> simple( + Supplier> model, + double x, + double y, + double z, + double size + ) { + return simple(model, x, y, z, size, false); + } + + public static Supplier> simple( + Supplier> model, + double x, + double y, + double z, + double size, + boolean useOldHandRender + ) { + return () -> new SimpleGunRenderer<>(model.get(), x, y, z, size, useOldHandRender); + } +} diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M2HBItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/SimpleGunRenderer.java similarity index 51% rename from src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M2HBItemRenderer.java rename to src/main/java/com/atsuishio/superbwarfare/client/renderer/SimpleGunRenderer.java index a5a71bbea..8fb38a206 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M2HBItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/SimpleGunRenderer.java @@ -1,10 +1,7 @@ -package com.atsuishio.superbwarfare.client.renderer.gun; +package com.atsuishio.superbwarfare.client.renderer; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.model.item.M2HBItemModel; -import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.machinegun.M2HBItem; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.Minecraft; @@ -12,17 +9,31 @@ import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; +import software.bernie.geckolib.animatable.GeoAnimatable; import software.bernie.geckolib.animatable.GeoItem; import software.bernie.geckolib.cache.object.GeoBone; +import software.bernie.geckolib.model.GeoModel; -public class M2HBItemRenderer extends CustomGunRenderer { +public class SimpleGunRenderer extends CustomGunRenderer { - public M2HBItemRenderer() { - super(new M2HBItemModel()); + private final double x; + private final double y; + private final double z; + private final double size; + private final boolean useOldHandRenderer; + + public SimpleGunRenderer(GeoModel model, double x, double y, double z, double size, boolean useOldHandRenderer) { + super(model); + + this.x = x; + this.y = y; + this.z = z; + this.size = size; + this.useOldHandRenderer = useOldHandRenderer; } @Override - public void renderRecursively(PoseStack stack, M2HBItem animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, int color) { + public void renderRecursively(PoseStack poseStack, T animatable, GeoBone bone, RenderType renderType, MultiBufferSource bufferSource, VertexConsumer buffer, boolean isReRender, float partialTick, int packedLight, int packedOverlay, int colour) { Minecraft mc = Minecraft.getInstance(); String name = bone.getName(); boolean renderingArms = false; @@ -39,13 +50,14 @@ public class M2HBItemRenderer extends CustomGunRenderer { if (itemStack.getItem() instanceof GunItem && GeoItem.getId(itemStack) == this.getInstanceId(animatable)) { if (this.renderPerspective == ItemDisplayContext.FIRST_PERSON_RIGHT_HAND || this.renderPerspective == ItemDisplayContext.THIRD_PERSON_RIGHT_HAND) { - AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0.1, 2.95, 1.2); + AnimationHelper.handleShootFlare(name, poseStack, itemStack, bone, bufferSource, packedLight, this.x, this.y, this.z, this.size); } } if (renderingArms) { - AnimationHelper.renderArms(player, this.renderPerspective, stack, name, bone, buffer, type, packedLightIn, false); + AnimationHelper.renderArms(player, this.renderPerspective, poseStack, name, bone, bufferSource, renderType, packedLight, this.useOldHandRenderer); } - super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); + + super.renderRecursively(poseStack, animatable, bone, renderType, bufferSource, buffer, isReRender, partialTick, packedLight, packedOverlay, colour); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Aa12ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Aa12ItemRenderer.java deleted file mode 100644 index 541eb1c51..000000000 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Aa12ItemRenderer.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.atsuishio.superbwarfare.client.renderer.gun; - -import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.model.item.Aa12ItemModel; -import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; -import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.shotgun.Aa12Item; -import com.mojang.blaze3d.vertex.PoseStack; -import com.mojang.blaze3d.vertex.VertexConsumer; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.world.item.ItemStack; -import software.bernie.geckolib.animatable.GeoItem; -import software.bernie.geckolib.cache.object.GeoBone; - -public class Aa12ItemRenderer extends CustomGunRenderer { - - public Aa12ItemRenderer() { - super(new Aa12ItemModel()); - } - - @Override - public void renderRecursively(PoseStack stack, Aa12Item animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, int color) { - Minecraft mc = Minecraft.getInstance(); - String name = bone.getName(); - boolean renderingArms = false; - if (name.equals("Lefthand") || name.equals("Righthand")) { - bone.setHidden(true); - renderingArms = true; - } else { - bone.setHidden(false); - } - - var player = mc.player; - if (player == null) return; - ItemStack itemStack = player.getMainHandItem(); - - if (itemStack.getItem() instanceof GunItem && GeoItem.getId(itemStack) == this.getInstanceId(animatable)) { - AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0, 1.31465, 0.5); - } - - if (renderingArms) { - AnimationHelper.renderArms(player, this.renderPerspective, stack, name, bone, buffer, type, packedLightIn, true); - } - super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); - } -} diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/AureliaSceptreRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/AureliaSceptreRenderer.java deleted file mode 100644 index 0398ced2d..000000000 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/AureliaSceptreRenderer.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.atsuishio.superbwarfare.client.renderer.gun; - -import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.model.item.AureliaSceptreModel; -import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; -import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.handgun.AureliaSceptre; -import com.mojang.blaze3d.vertex.PoseStack; -import com.mojang.blaze3d.vertex.VertexConsumer; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.world.item.ItemStack; -import software.bernie.geckolib.animatable.GeoItem; -import software.bernie.geckolib.cache.object.GeoBone; - -public class AureliaSceptreRenderer extends CustomGunRenderer { - - public AureliaSceptreRenderer() { - super(new AureliaSceptreModel()); - } - - @Override - public void renderRecursively(PoseStack stack, AureliaSceptre animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, int color) { - Minecraft mc = Minecraft.getInstance(); - String name = bone.getName(); - boolean renderingArms = false; - if (name.equals("Lefthand") || name.equals("Righthand")) { - bone.setHidden(true); - renderingArms = true; - } else { - bone.setHidden(false); - } - - var player = mc.player; - if (player == null) return; - ItemStack itemStack = player.getMainHandItem(); - if (itemStack.getItem() instanceof GunItem && GeoItem.getId(itemStack) == this.getInstanceId(animatable)) { - AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0, 0.3022, 0.3); - } - - if (renderingArms) { - AnimationHelper.renderArms(player, this.renderPerspective, stack, name, bone, this.currentBuffer, type, packedLightIn, false); - } - super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); - } -} diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Glock17ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Glock17ItemRenderer.java deleted file mode 100644 index 6bd7a549d..000000000 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Glock17ItemRenderer.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.atsuishio.superbwarfare.client.renderer.gun; - -import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.model.item.Glock17ItemModel; -import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; -import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.handgun.Glock17Item; -import com.mojang.blaze3d.vertex.PoseStack; -import com.mojang.blaze3d.vertex.VertexConsumer; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.world.item.ItemDisplayContext; -import net.minecraft.world.item.ItemStack; -import software.bernie.geckolib.animatable.GeoItem; -import software.bernie.geckolib.cache.object.GeoBone; - -public class Glock17ItemRenderer extends CustomGunRenderer { - - public Glock17ItemRenderer() { - super(new Glock17ItemModel()); - } - - @Override - public void renderRecursively(PoseStack stack, Glock17Item animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, int color) { - Minecraft mc = Minecraft.getInstance(); - String name = bone.getName(); - boolean renderingArms = false; - if (name.equals("Lefthand") || name.equals("Righthand")) { - bone.setHidden(true); - renderingArms = true; - } else { - bone.setHidden(false); - } - - var player = mc.player; - if (player == null) return; - ItemStack itemStack = player.getMainHandItem(); - if (itemStack.getItem() instanceof GunItem && GeoItem.getId(itemStack) == this.getInstanceId(animatable)) { - if (this.renderPerspective == ItemDisplayContext.FIRST_PERSON_RIGHT_HAND || this.renderPerspective == ItemDisplayContext.THIRD_PERSON_RIGHT_HAND) { - AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0, 0.3022, 0.3); - } - } - - if (renderingArms) { - AnimationHelper.renderArms(player, this.renderPerspective, stack, name, bone, buffer, type, packedLightIn, false); - } - super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); - } -} diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Glock18ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Glock18ItemRenderer.java deleted file mode 100644 index 9e2af0e4e..000000000 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Glock18ItemRenderer.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.atsuishio.superbwarfare.client.renderer.gun; - -import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.model.item.Glock18ItemModel; -import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; -import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.handgun.Glock18Item; -import com.mojang.blaze3d.vertex.PoseStack; -import com.mojang.blaze3d.vertex.VertexConsumer; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.world.item.ItemDisplayContext; -import net.minecraft.world.item.ItemStack; -import software.bernie.geckolib.animatable.GeoItem; -import software.bernie.geckolib.cache.object.GeoBone; - -public class Glock18ItemRenderer extends CustomGunRenderer { - - public Glock18ItemRenderer() { - super(new Glock18ItemModel()); - } - - @Override - public void renderRecursively(PoseStack stack, Glock18Item animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, int color) { - Minecraft mc = Minecraft.getInstance(); - String name = bone.getName(); - boolean renderingArms = false; - if (name.equals("Lefthand") || name.equals("Righthand")) { - bone.setHidden(true); - renderingArms = true; - } else { - bone.setHidden(false); - } - - var player = mc.player; - if (player == null) return; - ItemStack itemStack = player.getMainHandItem(); - if (itemStack.getItem() instanceof GunItem && GeoItem.getId(itemStack) == this.getInstanceId(animatable)) { - if (this.renderPerspective == ItemDisplayContext.FIRST_PERSON_RIGHT_HAND || this.renderPerspective == ItemDisplayContext.THIRD_PERSON_RIGHT_HAND) { - AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0, 0.3022, 0.3); - } - } - - if (renderingArms) { - AnimationHelper.renderArms(player, this.renderPerspective, stack, name, bone, buffer, type, packedLightIn, false); - } - super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); - } -} diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/HomemadeShotgunItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/HomemadeShotgunItemRenderer.java deleted file mode 100644 index 745f62029..000000000 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/HomemadeShotgunItemRenderer.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.atsuishio.superbwarfare.client.renderer.gun; - -import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.model.item.HomemadeShotgunItemModel; -import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; -import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.shotgun.HomemadeShotgunItem; -import com.mojang.blaze3d.vertex.PoseStack; -import com.mojang.blaze3d.vertex.VertexConsumer; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.world.item.ItemDisplayContext; -import net.minecraft.world.item.ItemStack; -import software.bernie.geckolib.animatable.GeoItem; -import software.bernie.geckolib.cache.object.GeoBone; - -public class HomemadeShotgunItemRenderer extends CustomGunRenderer { - - public HomemadeShotgunItemRenderer() { - super(new HomemadeShotgunItemModel()); - } - - @Override - public void renderRecursively(PoseStack stack, HomemadeShotgunItem animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, int color) { - Minecraft mc = Minecraft.getInstance(); - String name = bone.getName(); - boolean renderingArms = false; - if (name.equals("Lefthand") || name.equals("Righthand")) { - bone.setHidden(true); - renderingArms = true; - } else { - bone.setHidden(false); - } - - var player = mc.player; - if (player == null) return; - ItemStack itemStack = player.getMainHandItem(); - if (itemStack.getItem() instanceof GunItem && GeoItem.getId(itemStack) == this.getInstanceId(animatable)) { - if (this.renderPerspective == ItemDisplayContext.FIRST_PERSON_RIGHT_HAND || this.renderPerspective == ItemDisplayContext.THIRD_PERSON_RIGHT_HAND) { - AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0.05, 0.25, 1.2); - } - } - - if (renderingArms) { - AnimationHelper.renderArms(player, this.renderPerspective, stack, name, bone, buffer, type, packedLightIn, false); - } - super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); - } -} - diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/HuntingRifleItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/HuntingRifleItemRenderer.java deleted file mode 100644 index 8536d2556..000000000 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/HuntingRifleItemRenderer.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.atsuishio.superbwarfare.client.renderer.gun; - -import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.model.item.HuntingRifleItemModel; -import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; -import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.sniper.HuntingRifleItem; -import com.mojang.blaze3d.vertex.PoseStack; -import com.mojang.blaze3d.vertex.VertexConsumer; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.world.item.ItemDisplayContext; -import net.minecraft.world.item.ItemStack; -import software.bernie.geckolib.animatable.GeoItem; -import software.bernie.geckolib.cache.object.GeoBone; - -public class HuntingRifleItemRenderer extends CustomGunRenderer { - - public HuntingRifleItemRenderer() { - super(new HuntingRifleItemModel()); - } - - @Override - public void renderRecursively(PoseStack stack, HuntingRifleItem animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, int color) { - Minecraft mc = Minecraft.getInstance(); - String name = bone.getName(); - boolean renderingArms = false; - if (name.equals("Lefthand") || name.equals("Righthand")) { - bone.setHidden(true); - renderingArms = true; - } else { - bone.setHidden(false); - } - - var player = mc.player; - if (player == null) return; - ItemStack itemStack = player.getMainHandItem(); - if (itemStack.getItem() instanceof GunItem && GeoItem.getId(itemStack) == this.getInstanceId(animatable)) { - if (this.renderPerspective == ItemDisplayContext.FIRST_PERSON_RIGHT_HAND || this.renderPerspective == ItemDisplayContext.THIRD_PERSON_RIGHT_HAND) { - AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0, 2.234375, 0.6); - } - } - - if (renderingArms) { - AnimationHelper.renderArms(player, this.renderPerspective, stack, name, bone, buffer, type, packedLightIn, false); - } - super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); - } -} - diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/K98ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/K98ItemRenderer.java deleted file mode 100644 index 61ee8c215..000000000 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/K98ItemRenderer.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.atsuishio.superbwarfare.client.renderer.gun; - -import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.model.item.K98ItemModel; -import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; -import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.sniper.K98Item; -import com.mojang.blaze3d.vertex.PoseStack; -import com.mojang.blaze3d.vertex.VertexConsumer; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.world.item.ItemDisplayContext; -import net.minecraft.world.item.ItemStack; -import software.bernie.geckolib.animatable.GeoItem; -import software.bernie.geckolib.cache.object.GeoBone; - -public class K98ItemRenderer extends CustomGunRenderer { - - public K98ItemRenderer() { - super(new K98ItemModel()); - } - - @Override - public void renderRecursively(PoseStack stack, K98Item animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, int color) { - Minecraft mc = Minecraft.getInstance(); - String name = bone.getName(); - boolean renderingArms = false; - if (name.equals("Lefthand") || name.equals("Righthand")) { - bone.setHidden(true); - renderingArms = true; - } else { - bone.setHidden(false); - } - - var player = mc.player; - if (player == null) return; - ItemStack itemStack = player.getMainHandItem(); - - if (itemStack.getItem() instanceof GunItem && GeoItem.getId(itemStack) == this.getInstanceId(animatable)) { - if (this.renderPerspective == ItemDisplayContext.FIRST_PERSON_RIGHT_HAND || this.renderPerspective == ItemDisplayContext.THIRD_PERSON_RIGHT_HAND) { - AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0, 1.9772, 0.4); - } - } - - if (renderingArms) { - AnimationHelper.renderArms(player, this.renderPerspective, stack, name, bone, buffer, type, packedLightIn, true); - } - super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); - } -} diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M1911ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M1911ItemRenderer.java deleted file mode 100644 index e3193cff8..000000000 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M1911ItemRenderer.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.atsuishio.superbwarfare.client.renderer.gun; - -import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.model.item.M1911ItemModel; -import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; -import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.handgun.M1911Item; -import com.mojang.blaze3d.vertex.PoseStack; -import com.mojang.blaze3d.vertex.VertexConsumer; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.world.item.ItemDisplayContext; -import net.minecraft.world.item.ItemStack; -import software.bernie.geckolib.animatable.GeoItem; -import software.bernie.geckolib.cache.object.GeoBone; - -public class M1911ItemRenderer extends CustomGunRenderer { - - public M1911ItemRenderer() { - super(new M1911ItemModel()); - } - - @Override - public void renderRecursively(PoseStack stack, M1911Item animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, int color) { - Minecraft mc = Minecraft.getInstance(); - String name = bone.getName(); - var player = mc.player; - if (player == null) return; - ItemStack itemStack = player.getMainHandItem(); - boolean renderingArms = false; - if (name.equals("Lefthand") || name.equals("Righthand")) { - bone.setHidden(true); - renderingArms = true; - } else { - bone.setHidden(false); - } - - if (itemStack.getItem() instanceof GunItem && GeoItem.getId(itemStack) == this.getInstanceId(animatable)) { - if (this.renderPerspective == ItemDisplayContext.FIRST_PERSON_RIGHT_HAND || this.renderPerspective == ItemDisplayContext.THIRD_PERSON_RIGHT_HAND) { - AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0, 0.442825, 0.35); - } - } - - if (renderingArms) { - AnimationHelper.renderArms(player, this.renderPerspective, stack, name, bone, buffer, type, packedLightIn, false); - } - super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); - } -} diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M60ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M60ItemRenderer.java deleted file mode 100644 index 71ace3274..000000000 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M60ItemRenderer.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.atsuishio.superbwarfare.client.renderer.gun; - -import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.model.item.M60ItemModel; -import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; -import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.machinegun.M60Item; -import com.mojang.blaze3d.vertex.PoseStack; -import com.mojang.blaze3d.vertex.VertexConsumer; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.world.item.ItemDisplayContext; -import net.minecraft.world.item.ItemStack; -import software.bernie.geckolib.animatable.GeoItem; -import software.bernie.geckolib.cache.object.GeoBone; - -public class M60ItemRenderer extends CustomGunRenderer { - - public M60ItemRenderer() { - super(new M60ItemModel()); - } - - @Override - public void renderRecursively(PoseStack stack, M60Item animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, int color) { - Minecraft mc = Minecraft.getInstance(); - String name = bone.getName(); - boolean renderingArms = false; - if (name.equals("Lefthand") || name.equals("Righthand")) { - bone.setHidden(true); - renderingArms = true; - } else { - bone.setHidden(false); - } - - var player = mc.player; - if (player == null) return; - ItemStack itemStack = player.getMainHandItem(); - - if (itemStack.getItem() instanceof GunItem && GeoItem.getId(itemStack) == this.getInstanceId(animatable)) { - if (this.renderPerspective == ItemDisplayContext.FIRST_PERSON_RIGHT_HAND || this.renderPerspective == ItemDisplayContext.THIRD_PERSON_RIGHT_HAND) { - AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0.1, 1.95, 0.45); - } - } - - if (renderingArms) { - AnimationHelper.renderArms(player, this.renderPerspective, stack, name, bone, buffer, type, packedLightIn, true); - } - super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); - } -} diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M79ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M79ItemRenderer.java deleted file mode 100644 index 5b7c820ff..000000000 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M79ItemRenderer.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.atsuishio.superbwarfare.client.renderer.gun; - -import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.model.item.M79ItemModel; -import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; -import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.launcher.M79Item; -import com.mojang.blaze3d.vertex.PoseStack; -import com.mojang.blaze3d.vertex.VertexConsumer; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.world.item.ItemDisplayContext; -import net.minecraft.world.item.ItemStack; -import software.bernie.geckolib.animatable.GeoItem; -import software.bernie.geckolib.cache.object.GeoBone; - -public class M79ItemRenderer extends CustomGunRenderer { - - public M79ItemRenderer() { - super(new M79ItemModel()); - } - - @Override - public void renderRecursively(PoseStack stack, M79Item animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, int color) { - Minecraft mc = Minecraft.getInstance(); - String name = bone.getName(); - boolean renderingArms = false; - if (name.equals("Lefthand") || name.equals("Righthand")) { - bone.setHidden(true); - renderingArms = true; - } else { - bone.setHidden(false); - } - - var player = mc.player; - if (player == null) return; - ItemStack itemStack = player.getMainHandItem(); - - if (itemStack.getItem() instanceof GunItem && GeoItem.getId(itemStack) == this.getInstanceId(animatable)) { - if (this.renderPerspective == ItemDisplayContext.FIRST_PERSON_RIGHT_HAND || this.renderPerspective == ItemDisplayContext.THIRD_PERSON_RIGHT_HAND) { - AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0, 0.59375, 1); - } - } - - if (renderingArms) { - AnimationHelper.renderArms(player, this.renderPerspective, stack, name, bone, buffer, type, packedLightIn, true); - } - super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); - } -} diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M870ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M870ItemRenderer.java deleted file mode 100644 index 20af61568..000000000 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/M870ItemRenderer.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.atsuishio.superbwarfare.client.renderer.gun; - -import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.model.item.M870ItemModel; -import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; -import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.shotgun.M870Item; -import com.mojang.blaze3d.vertex.PoseStack; -import com.mojang.blaze3d.vertex.VertexConsumer; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.world.item.ItemDisplayContext; -import net.minecraft.world.item.ItemStack; -import software.bernie.geckolib.animatable.GeoItem; -import software.bernie.geckolib.cache.object.GeoBone; - -public class M870ItemRenderer extends CustomGunRenderer { - - public M870ItemRenderer() { - super(new M870ItemModel()); - } - - @Override - public void renderRecursively(PoseStack stack, M870Item animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, int color) { - Minecraft mc = Minecraft.getInstance(); - String name = bone.getName(); - boolean renderingArms = false; - if (name.equals("Lefthand") || name.equals("Righthand")) { - bone.setHidden(true); - renderingArms = true; - } else { - bone.setHidden(false); - } - - var player = mc.player; - if (player == null) return; - ItemStack itemStack = player.getMainHandItem(); - - if (itemStack.getItem() instanceof GunItem && GeoItem.getId(itemStack) == this.getInstanceId(animatable)) { - if (this.renderPerspective == ItemDisplayContext.FIRST_PERSON_RIGHT_HAND || this.renderPerspective == ItemDisplayContext.THIRD_PERSON_RIGHT_HAND) { - AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0, 1.4209, 0.8); - } - } - - if (renderingArms) { - AnimationHelper.renderArms(player, this.renderPerspective, stack, name, bone, buffer, type, packedLightIn, true); - } - super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); - } -} diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/MarlinItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/MarlinItemRenderer.java deleted file mode 100644 index 31884ae14..000000000 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/MarlinItemRenderer.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.atsuishio.superbwarfare.client.renderer.gun; - -import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.model.item.MarlinItemModel; -import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; -import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.rifle.MarlinItem; -import com.mojang.blaze3d.vertex.PoseStack; -import com.mojang.blaze3d.vertex.VertexConsumer; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.world.item.ItemDisplayContext; -import net.minecraft.world.item.ItemStack; -import software.bernie.geckolib.animatable.GeoItem; -import software.bernie.geckolib.cache.object.GeoBone; - -public class MarlinItemRenderer extends CustomGunRenderer { - - public MarlinItemRenderer() { - super(new MarlinItemModel()); - } - - @Override - public void renderRecursively(PoseStack stack, MarlinItem animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, int color) { - Minecraft mc = Minecraft.getInstance(); - String name = bone.getName(); - boolean renderingArms = false; - if (name.equals("Lefthand") || name.equals("Righthand")) { - bone.setHidden(true); - renderingArms = true; - } else { - bone.setHidden(false); - } - - var player = mc.player; - if (player == null) return; - ItemStack itemStack = player.getMainHandItem(); - - if (itemStack.getItem() instanceof GunItem && GeoItem.getId(itemStack) == this.getInstanceId(animatable)) { - if (this.renderPerspective == ItemDisplayContext.FIRST_PERSON_RIGHT_HAND || this.renderPerspective == ItemDisplayContext.THIRD_PERSON_RIGHT_HAND) { - AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0, 1.33720625, 0.4); - } - } - - if (renderingArms) { - AnimationHelper.renderArms(player, this.renderPerspective, stack, name, bone, buffer, type, packedLightIn, true); - } - super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); - } -} diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Mp443ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Mp443ItemRenderer.java deleted file mode 100644 index 176c16337..000000000 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Mp443ItemRenderer.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.atsuishio.superbwarfare.client.renderer.gun; - -import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.model.item.Mp443ItemModel; -import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; -import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.handgun.Mp443Item; -import com.mojang.blaze3d.vertex.PoseStack; -import com.mojang.blaze3d.vertex.VertexConsumer; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.world.item.ItemDisplayContext; -import net.minecraft.world.item.ItemStack; -import software.bernie.geckolib.animatable.GeoItem; -import software.bernie.geckolib.cache.object.GeoBone; - -public class Mp443ItemRenderer extends CustomGunRenderer { - - public Mp443ItemRenderer() { - super(new Mp443ItemModel()); - } - - @Override - public void renderRecursively(PoseStack stack, Mp443Item animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, int color) { - Minecraft mc = Minecraft.getInstance(); - String name = bone.getName(); - boolean renderingArms = false; - if (name.equals("Lefthand") || name.equals("Righthand")) { - bone.setHidden(true); - renderingArms = true; - } else { - bone.setHidden(false); - } - - var player = mc.player; - if (player == null) return; - ItemStack itemStack = player.getMainHandItem(); - if (itemStack.getItem() instanceof GunItem && GeoItem.getId(itemStack) == this.getInstanceId(animatable)) { - if (this.renderPerspective == ItemDisplayContext.FIRST_PERSON_RIGHT_HAND || this.renderPerspective == ItemDisplayContext.THIRD_PERSON_RIGHT_HAND) { - AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0, 0.33345, 0.3); - } - } - - if (renderingArms) { - AnimationHelper.renderArms(player, this.renderPerspective, stack, name, bone, buffer, type, packedLightIn, false); - } - super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); - } -} diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/RpgItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/RpgItemRenderer.java deleted file mode 100644 index 0a1f01dc0..000000000 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/RpgItemRenderer.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.atsuishio.superbwarfare.client.renderer.gun; - -import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.model.item.RpgItemModel; -import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; -import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.launcher.RpgItem; -import com.mojang.blaze3d.vertex.PoseStack; -import com.mojang.blaze3d.vertex.VertexConsumer; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.world.item.ItemDisplayContext; -import net.minecraft.world.item.ItemStack; -import software.bernie.geckolib.animatable.GeoItem; -import software.bernie.geckolib.cache.object.GeoBone; - -public class RpgItemRenderer extends CustomGunRenderer { - - public RpgItemRenderer() { - super(new RpgItemModel()); - } - - @Override - public void renderRecursively(PoseStack stack, RpgItem animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, int color) { - Minecraft mc = Minecraft.getInstance(); - String name = bone.getName(); - boolean renderingArms = false; - if (name.equals("Lefthand") || name.equals("Righthand")) { - bone.setHidden(true); - renderingArms = true; - } else { - bone.setHidden(false); - } - - var player = mc.player; - if (player == null) return; - ItemStack itemStack = player.getMainHandItem(); - - if (itemStack.getItem() instanceof GunItem && GeoItem.getId(itemStack) == this.getInstanceId(animatable)) { - if (this.renderPerspective == ItemDisplayContext.FIRST_PERSON_RIGHT_HAND || this.renderPerspective == ItemDisplayContext.THIRD_PERSON_RIGHT_HAND) { - AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0, 0.625, 0.7); - } - } - - if (renderingArms) { - AnimationHelper.renderArms(player, this.renderPerspective, stack, name, bone, buffer, type, packedLightIn, false); - } - super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); - } -} diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/SecondaryCataclysmRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/SecondaryCataclysmRenderer.java deleted file mode 100644 index 14663802b..000000000 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/SecondaryCataclysmRenderer.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.atsuishio.superbwarfare.client.renderer.gun; - -import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.model.item.SecondaryCataclysmModel; -import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; -import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.item.gun.launcher.SecondaryCataclysm; -import com.mojang.blaze3d.vertex.PoseStack; -import com.mojang.blaze3d.vertex.VertexConsumer; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.world.item.ItemDisplayContext; -import net.minecraft.world.item.ItemStack; -import software.bernie.geckolib.animatable.GeoItem; -import software.bernie.geckolib.cache.object.GeoBone; - -public class SecondaryCataclysmRenderer extends CustomGunRenderer { - - public SecondaryCataclysmRenderer() { - super(new SecondaryCataclysmModel()); - } - - @Override - public void renderRecursively(PoseStack stack, SecondaryCataclysm animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, int color) { - Minecraft mc = Minecraft.getInstance(); - String name = bone.getName(); - boolean renderingArms = false; - if (name.equals("Lefthand") || name.equals("Righthand")) { - bone.setHidden(true); - renderingArms = true; - } else { - bone.setHidden(false); - } - - var player = mc.player; - if (player == null) return; - ItemStack itemStack = player.getMainHandItem(); - - if (itemStack.getItem() instanceof GunItem && GeoItem.getId(itemStack) == this.getInstanceId(animatable)) { - if (this.renderPerspective == ItemDisplayContext.FIRST_PERSON_RIGHT_HAND || this.renderPerspective == ItemDisplayContext.THIRD_PERSON_RIGHT_HAND) { - AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0, 1.0375, 0.6); - } - } - - if (renderingArms) { - AnimationHelper.renderArms(player, this.renderPerspective, stack, name, bone, buffer, type, packedLightIn, false); - } - super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); - } -} diff --git a/src/main/java/com/atsuishio/superbwarfare/item/CustomRendererItem.java b/src/main/java/com/atsuishio/superbwarfare/item/CustomRendererItem.java index dbac00b01..9085d5a5b 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/CustomRendererItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/CustomRendererItem.java @@ -6,5 +6,5 @@ import software.bernie.geckolib.renderer.GeoItemRenderer; import java.util.function.Supplier; public interface CustomRendererItem { - Supplier> getRenderer(); + Supplier> getRenderer(); } diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/AureliaSceptre.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/AureliaSceptre.java index 7fca46e53..7e739d5fc 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/AureliaSceptre.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/AureliaSceptre.java @@ -1,8 +1,9 @@ package com.atsuishio.superbwarfare.item.gun.handgun; import com.atsuishio.superbwarfare.Mod; +import com.atsuishio.superbwarfare.client.GunRendererBuilder; import com.atsuishio.superbwarfare.client.TooltipTool; -import com.atsuishio.superbwarfare.client.renderer.gun.AureliaSceptreRenderer; +import com.atsuishio.superbwarfare.client.model.item.AureliaSceptreModel; import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModEnumExtensions; @@ -39,8 +40,8 @@ public class AureliaSceptre extends GunItem { } @Override - public Supplier> getRenderer() { - return AureliaSceptreRenderer::new; + public Supplier> getRenderer() { + return GunRendererBuilder.simple(AureliaSceptreModel::new, 0, 0, 0.3022, 0.3); } @OnlyIn(Dist.CLIENT) diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Glock17Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Glock17Item.java index 000c1c1cd..7b16243e3 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Glock17Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Glock17Item.java @@ -1,7 +1,8 @@ package com.atsuishio.superbwarfare.item.gun.handgun; import com.atsuishio.superbwarfare.Mod; -import com.atsuishio.superbwarfare.client.renderer.gun.Glock17ItemRenderer; +import com.atsuishio.superbwarfare.client.GunRendererBuilder; +import com.atsuishio.superbwarfare.client.model.item.Glock17ItemModel; import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModSounds; @@ -30,8 +31,8 @@ public class Glock17Item extends GunItem { } @Override - public Supplier> getRenderer() { - return Glock17ItemRenderer::new; + public Supplier> getRenderer() { + return GunRendererBuilder.simple(Glock17ItemModel::new, 0, 0, 0.3022, 0.3); } private PlayState fireAnimPredicate(AnimationState event) { diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Glock18Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Glock18Item.java index e7eb5e8a7..038d75e86 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Glock18Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Glock18Item.java @@ -1,7 +1,8 @@ package com.atsuishio.superbwarfare.item.gun.handgun; import com.atsuishio.superbwarfare.Mod; -import com.atsuishio.superbwarfare.client.renderer.gun.Glock18ItemRenderer; +import com.atsuishio.superbwarfare.client.GunRendererBuilder; +import com.atsuishio.superbwarfare.client.model.item.Glock18ItemModel; import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModSounds; @@ -30,8 +31,8 @@ public class Glock18Item extends GunItem { } @Override - public Supplier> getRenderer() { - return Glock18ItemRenderer::new; + public Supplier> getRenderer() { + return GunRendererBuilder.simple(Glock18ItemModel::new, 0, 0, 0.3022, 0.3); } private PlayState fireAnimPredicate(AnimationState event) { diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/M1911Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/M1911Item.java index a1d53c083..c3aec91f8 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/M1911Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/M1911Item.java @@ -1,7 +1,8 @@ package com.atsuishio.superbwarfare.item.gun.handgun; import com.atsuishio.superbwarfare.Mod; -import com.atsuishio.superbwarfare.client.renderer.gun.M1911ItemRenderer; +import com.atsuishio.superbwarfare.client.GunRendererBuilder; +import com.atsuishio.superbwarfare.client.model.item.M1911ItemModel; import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModSounds; @@ -30,8 +31,8 @@ public class M1911Item extends GunItem { } @Override - public Supplier> getRenderer() { - return M1911ItemRenderer::new; + public Supplier> getRenderer() { + return GunRendererBuilder.simple(M1911ItemModel::new, 0, 0, 0.442825, 0.35); } private PlayState fireAnimPredicate(AnimationState event) { diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Mp443Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Mp443Item.java index d05f537c3..ab7c8c446 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Mp443Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Mp443Item.java @@ -1,7 +1,8 @@ package com.atsuishio.superbwarfare.item.gun.handgun; import com.atsuishio.superbwarfare.Mod; -import com.atsuishio.superbwarfare.client.renderer.gun.Mp443ItemRenderer; +import com.atsuishio.superbwarfare.client.GunRendererBuilder; +import com.atsuishio.superbwarfare.client.model.item.Mp443ItemModel; import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModSounds; @@ -30,8 +31,8 @@ public class Mp443Item extends GunItem { } @Override - public Supplier> getRenderer() { - return Mp443ItemRenderer::new; + public Supplier> getRenderer() { + return GunRendererBuilder.simple(Mp443ItemModel::new, 0, 0, 0.33345, 0.3); } private PlayState fireAnimPredicate(AnimationState event) { diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Trachelium.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Trachelium.java index 0741ddbd8..05323ba60 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Trachelium.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Trachelium.java @@ -41,7 +41,7 @@ public class Trachelium extends GunItem { } @Override - public Supplier> getRenderer() { + public Supplier> getRenderer() { return TracheliumItemRenderer::new; } diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/heavy/Ntw20Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/heavy/Ntw20Item.java index 12247085a..e9df09d2b 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/heavy/Ntw20Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/heavy/Ntw20Item.java @@ -37,7 +37,7 @@ public class Ntw20Item extends GunItem { } @Override - public Supplier> getRenderer() { + public Supplier> getRenderer() { return Ntw20Renderer::new; } diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/JavelinItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/JavelinItem.java index 813489cdf..8c05665a4 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/JavelinItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/JavelinItem.java @@ -58,7 +58,7 @@ public class JavelinItem extends GunItem { } @Override - public Supplier> getRenderer() { + public Supplier> getRenderer() { return JavelinItemRenderer::new; } diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/M79Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/M79Item.java index 48a61ffd9..444212d6e 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/M79Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/M79Item.java @@ -1,7 +1,8 @@ package com.atsuishio.superbwarfare.item.gun.launcher; import com.atsuishio.superbwarfare.Mod; -import com.atsuishio.superbwarfare.client.renderer.gun.M79ItemRenderer; +import com.atsuishio.superbwarfare.client.GunRendererBuilder; +import com.atsuishio.superbwarfare.client.model.item.M79ItemModel; import com.atsuishio.superbwarfare.client.tooltip.component.LauncherImageComponent; import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.event.ClientEventHandler; @@ -42,8 +43,8 @@ public class M79Item extends GunItem { } @Override - public Supplier> getRenderer() { - return M79ItemRenderer::new; + public Supplier> getRenderer() { + return GunRendererBuilder.simple(M79ItemModel::new, 0, 0, 0.59375, 1, true); } private PlayState idlePredicate(AnimationState event) { diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/RpgItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/RpgItem.java index fd7486f53..60c95cdfa 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/RpgItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/RpgItem.java @@ -1,7 +1,8 @@ package com.atsuishio.superbwarfare.item.gun.launcher; import com.atsuishio.superbwarfare.Mod; -import com.atsuishio.superbwarfare.client.renderer.gun.RpgItemRenderer; +import com.atsuishio.superbwarfare.client.GunRendererBuilder; +import com.atsuishio.superbwarfare.client.model.item.RpgItemModel; import com.atsuishio.superbwarfare.client.tooltip.component.LauncherImageComponent; import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.event.ClientEventHandler; @@ -47,8 +48,8 @@ public class RpgItem extends GunItem { } @Override - public Supplier> getRenderer() { - return RpgItemRenderer::new; + public Supplier> getRenderer() { + return GunRendererBuilder.simple(RpgItemModel::new, 0, 0, 0.625, 0.7); } private PlayState idlePredicate(AnimationState event) { diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/SecondaryCataclysm.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/SecondaryCataclysm.java index 4f811b7df..2cdcb3453 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/SecondaryCataclysm.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/SecondaryCataclysm.java @@ -1,8 +1,9 @@ package com.atsuishio.superbwarfare.item.gun.launcher; import com.atsuishio.superbwarfare.Mod; +import com.atsuishio.superbwarfare.client.GunRendererBuilder; import com.atsuishio.superbwarfare.client.TooltipTool; -import com.atsuishio.superbwarfare.client.renderer.gun.SecondaryCataclysmRenderer; +import com.atsuishio.superbwarfare.client.model.item.SecondaryCataclysmModel; import com.atsuishio.superbwarfare.client.tooltip.component.SecondaryCataclysmImageComponent; import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.entity.projectile.GunGrenadeEntity; @@ -83,8 +84,8 @@ public class SecondaryCataclysm extends GunItem implements EnergyStorageItem { } @Override - public Supplier> getRenderer() { - return SecondaryCataclysmRenderer::new; + public Supplier> getRenderer() { + return GunRendererBuilder.simple(SecondaryCataclysmModel::new, 0, 0, 1.0375, 0.6); } private PlayState reloadAnimPredicate(AnimationState event) { diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/DevotionItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/DevotionItem.java index 1ec9b8f6a..b766cbcb4 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/DevotionItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/DevotionItem.java @@ -28,7 +28,7 @@ public class DevotionItem extends GunItem { } @Override - public Supplier> getRenderer() { + public Supplier> getRenderer() { return DevotionItemRenderer::new; } diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/M2HBItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/M2HBItem.java index 5d1f84b6c..d54fba51c 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/M2HBItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/M2HBItem.java @@ -1,7 +1,8 @@ package com.atsuishio.superbwarfare.item.gun.machinegun; import com.atsuishio.superbwarfare.Mod; -import com.atsuishio.superbwarfare.client.renderer.gun.M2HBItemRenderer; +import com.atsuishio.superbwarfare.client.GunRendererBuilder; +import com.atsuishio.superbwarfare.client.model.item.M2HBItemModel; import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModEnumExtensions; @@ -38,8 +39,8 @@ public class M2HBItem extends GunItem { } @Override - public Supplier> getRenderer() { - return M2HBItemRenderer::new; + public Supplier> getRenderer() { + return GunRendererBuilder.simple(M2HBItemModel::new, 0, 0.1, 2.95, 1.2); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/M60Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/M60Item.java index 4e9993f78..840f8fba2 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/M60Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/M60Item.java @@ -1,7 +1,8 @@ package com.atsuishio.superbwarfare.item.gun.machinegun; import com.atsuishio.superbwarfare.Mod; -import com.atsuishio.superbwarfare.client.renderer.gun.M60ItemRenderer; +import com.atsuishio.superbwarfare.client.GunRendererBuilder; +import com.atsuishio.superbwarfare.client.model.item.M60ItemModel; import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModSounds; @@ -34,8 +35,8 @@ public class M60Item extends GunItem { } @Override - public Supplier> getRenderer() { - return M60ItemRenderer::new; + public Supplier> getRenderer() { + return GunRendererBuilder.simple(M60ItemModel::new, 0, 0.1, 1.95, 0.45, true); } private PlayState fireAnimPredicate(AnimationState event) { diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/MinigunItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/MinigunItem.java index 2861bc6fd..eae5e3541 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/MinigunItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/MinigunItem.java @@ -35,7 +35,7 @@ public class MinigunItem extends GunItem { } @Override - public Supplier> getRenderer() { + public Supplier> getRenderer() { return MinigunItemRenderer::new; } diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/RpkItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/RpkItem.java index b1c6dbd0c..013c28bba 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/RpkItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/RpkItem.java @@ -35,7 +35,7 @@ public class RpkItem extends GunItem { } @Override - public Supplier> getRenderer() { + public Supplier> getRenderer() { return RpkItemRenderer::new; } diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/AK12Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/AK12Item.java index 91c72b1c8..e7ab37744 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/AK12Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/AK12Item.java @@ -37,7 +37,7 @@ public class AK12Item extends GunItem { } @Override - public Supplier> getRenderer() { + public Supplier> getRenderer() { return AK12ItemRenderer::new; } diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/AK47Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/AK47Item.java index 6c73af915..12d474c16 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/AK47Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/AK47Item.java @@ -36,7 +36,7 @@ public class AK47Item extends GunItem { return Set.of(ModSounds.AK_47_RELOAD_EMPTY.get(), ModSounds.AK_47_RELOAD_NORMAL.get()); } - public Supplier> getRenderer() { + public Supplier> getRenderer() { return AK47ItemRenderer::new; } diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Hk416Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Hk416Item.java index bf563fc22..b3d660c86 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Hk416Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Hk416Item.java @@ -32,7 +32,7 @@ public class Hk416Item extends GunItem { } @Override - public Supplier> getRenderer() { + public Supplier> getRenderer() { return Hk416ItemRenderer::new; } diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/InsidiousItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/InsidiousItem.java index 670602bd3..59dc74b1c 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/InsidiousItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/InsidiousItem.java @@ -28,7 +28,7 @@ public class InsidiousItem extends GunItem { } @Override - public Supplier> getRenderer() { + public Supplier> getRenderer() { return InsidiousItemRenderer::new; } diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/M4Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/M4Item.java index e18524876..63f278119 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/M4Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/M4Item.java @@ -32,7 +32,7 @@ public class M4Item extends GunItem { } @Override - public Supplier> getRenderer() { + public Supplier> getRenderer() { return M4ItemRenderer::new; } diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/MarlinItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/MarlinItem.java index 57a481683..bd0ef18ec 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/MarlinItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/MarlinItem.java @@ -1,7 +1,8 @@ package com.atsuishio.superbwarfare.item.gun.rifle; import com.atsuishio.superbwarfare.Mod; -import com.atsuishio.superbwarfare.client.renderer.gun.MarlinItemRenderer; +import com.atsuishio.superbwarfare.client.GunRendererBuilder; +import com.atsuishio.superbwarfare.client.model.item.MarlinItemModel; import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModSounds; @@ -28,8 +29,8 @@ public class MarlinItem extends GunItem { } @Override - public Supplier> getRenderer() { - return MarlinItemRenderer::new; + public Supplier> getRenderer() { + return GunRendererBuilder.simple(MarlinItemModel::new, 0, 0, 1.33720625, 0.4, true); } private PlayState fireAnimPredicate(AnimationState event) { diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Mk14Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Mk14Item.java index a40f21f98..4499d7f46 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Mk14Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Mk14Item.java @@ -34,7 +34,7 @@ public class Mk14Item extends GunItem { } @Override - public Supplier> getRenderer() { + public Supplier> getRenderer() { return Mk14ItemRenderer::new; } diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Qbz95Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Qbz95Item.java index 47d28d6b7..06be20972 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Qbz95Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Qbz95Item.java @@ -37,7 +37,7 @@ public class Qbz95Item extends GunItem { } @Override - public Supplier> getRenderer() { + public Supplier> getRenderer() { return Qbz95ItemRenderer::new; } diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/SksItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/SksItem.java index 34712d8ee..34eebc09e 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/SksItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/SksItem.java @@ -38,7 +38,7 @@ public class SksItem extends GunItem { } @Override - public Supplier> getRenderer() { + public Supplier> getRenderer() { return SksItemRenderer::new; } diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/Aa12Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/Aa12Item.java index 9a32fc383..bd20c96d5 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/Aa12Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/Aa12Item.java @@ -1,7 +1,8 @@ package com.atsuishio.superbwarfare.item.gun.shotgun; import com.atsuishio.superbwarfare.Mod; -import com.atsuishio.superbwarfare.client.renderer.gun.Aa12ItemRenderer; +import com.atsuishio.superbwarfare.client.GunRendererBuilder; +import com.atsuishio.superbwarfare.client.model.item.Aa12ItemModel; import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModEnumExtensions; @@ -28,8 +29,8 @@ public class Aa12Item extends GunItem { } @Override - public Supplier> getRenderer() { - return Aa12ItemRenderer::new; + public Supplier> getRenderer() { + return GunRendererBuilder.simple(Aa12ItemModel::new, 0, 0, 1.31465, 0.5, true); } private PlayState idlePredicate(AnimationState event) { diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/HomemadeShotgunItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/HomemadeShotgunItem.java index c7f6904c2..0e2b853d6 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/HomemadeShotgunItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/HomemadeShotgunItem.java @@ -1,7 +1,8 @@ package com.atsuishio.superbwarfare.item.gun.shotgun; import com.atsuishio.superbwarfare.Mod; -import com.atsuishio.superbwarfare.client.renderer.gun.HomemadeShotgunItemRenderer; +import com.atsuishio.superbwarfare.client.GunRendererBuilder; +import com.atsuishio.superbwarfare.client.model.item.HomemadeShotgunItemModel; import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModSounds; @@ -57,8 +58,8 @@ public class HomemadeShotgunItem extends GunItem { } @Override - public Supplier> getRenderer() { - return HomemadeShotgunItemRenderer::new; + public Supplier> getRenderer() { + return GunRendererBuilder.simple(HomemadeShotgunItemModel::new, 0, 0.05, 0.25, 1.2); } private PlayState idlePredicate(AnimationState event) { diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/M870Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/M870Item.java index 644c79950..e80b8b213 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/M870Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/M870Item.java @@ -1,7 +1,8 @@ package com.atsuishio.superbwarfare.item.gun.shotgun; import com.atsuishio.superbwarfare.Mod; -import com.atsuishio.superbwarfare.client.renderer.gun.M870ItemRenderer; +import com.atsuishio.superbwarfare.client.GunRendererBuilder; +import com.atsuishio.superbwarfare.client.model.item.M870ItemModel; import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModSounds; @@ -28,8 +29,8 @@ public class M870Item extends GunItem { } @Override - public Supplier> getRenderer() { - return M870ItemRenderer::new; + public Supplier> getRenderer() { + return GunRendererBuilder.simple(M870ItemModel::new, 0, 0, 1.4209, 0.8, true); } private PlayState fireAnimPredicate(AnimationState event) { diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/smg/Mp5Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/smg/Mp5Item.java index 5aa82f67d..72731daa0 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/smg/Mp5Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/smg/Mp5Item.java @@ -34,7 +34,7 @@ public class Mp5Item extends GunItem { } @Override - public Supplier> getRenderer() { + public Supplier> getRenderer() { return Mp5ItemRenderer::new; } diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/smg/VectorItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/smg/VectorItem.java index 89efcb598..6b93a3656 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/smg/VectorItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/smg/VectorItem.java @@ -94,7 +94,7 @@ public class VectorItem extends GunItem { } @Override - public Supplier> getRenderer() { + public Supplier> getRenderer() { return VectorItemRenderer::new; } diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/HuntingRifleItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/HuntingRifleItem.java index 2e3cd737a..c512d6303 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/HuntingRifleItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/HuntingRifleItem.java @@ -1,7 +1,8 @@ package com.atsuishio.superbwarfare.item.gun.sniper; import com.atsuishio.superbwarfare.Mod; -import com.atsuishio.superbwarfare.client.renderer.gun.HuntingRifleItemRenderer; +import com.atsuishio.superbwarfare.client.GunRendererBuilder; +import com.atsuishio.superbwarfare.client.model.item.HuntingRifleItemModel; import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModSounds; @@ -33,8 +34,8 @@ public class HuntingRifleItem extends GunItem { } @Override - public Supplier> getRenderer() { - return HuntingRifleItemRenderer::new; + public Supplier> getRenderer() { + return GunRendererBuilder.simple(HuntingRifleItemModel::new, 0, 0, 2.234375, 0.6); } private PlayState idlePredicate(AnimationState event) { diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/K98Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/K98Item.java index 2016fadab..053857c90 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/K98Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/K98Item.java @@ -1,7 +1,8 @@ package com.atsuishio.superbwarfare.item.gun.sniper; import com.atsuishio.superbwarfare.Mod; -import com.atsuishio.superbwarfare.client.renderer.gun.K98ItemRenderer; +import com.atsuishio.superbwarfare.client.GunRendererBuilder; +import com.atsuishio.superbwarfare.client.model.item.K98ItemModel; import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModSounds; @@ -28,8 +29,8 @@ public class K98Item extends GunItem { } @Override - public Supplier> getRenderer() { - return K98ItemRenderer::new; + public Supplier> getRenderer() { + return GunRendererBuilder.simple(K98ItemModel::new, 0, 0, 1.9772, 0.4, true); } private PlayState fireAnimPredicate(AnimationState event) { diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/M98bItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/M98bItem.java index 693943619..d6311c3b3 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/M98bItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/M98bItem.java @@ -35,7 +35,7 @@ public class M98bItem extends GunItem { } @Override - public Supplier> getRenderer() { + public Supplier> getRenderer() { return M98bItemRenderer::new; } diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/MosinNagantItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/MosinNagantItem.java index b40da0879..6a93a37de 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/MosinNagantItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/MosinNagantItem.java @@ -28,7 +28,7 @@ public class MosinNagantItem extends GunItem { } @Override - public Supplier> getRenderer() { + public Supplier> getRenderer() { return MosinNagantItemRenderer::new; } diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/SentinelItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/SentinelItem.java index bb7e524cf..3c4ded4af 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/SentinelItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/SentinelItem.java @@ -55,7 +55,7 @@ public class SentinelItem extends GunItem implements EnergyStorageItem { } @Override - public Supplier> getRenderer() { + public Supplier> getRenderer() { return SentinelItemRenderer::new; } diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/SvdItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/SvdItem.java index 72be316cd..836d9a33f 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/SvdItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/SvdItem.java @@ -34,7 +34,7 @@ public class SvdItem extends GunItem { } @Override - public Supplier> getRenderer() { + public Supplier> getRenderer() { return SvdItemRenderer::new; } diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/special/BocekItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/special/BocekItem.java index 2ca803bcb..33ed6819f 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/special/BocekItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/special/BocekItem.java @@ -45,7 +45,7 @@ public class BocekItem extends GunItem { } @Override - public Supplier> getRenderer() { + public Supplier> getRenderer() { return BocekItemRenderer::new; } diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/special/TaserItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/special/TaserItem.java index b6c095b30..b8fe6582d 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/special/TaserItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/special/TaserItem.java @@ -68,7 +68,7 @@ public class TaserItem extends GunItem implements EnergyStorageItem { } @Override - public Supplier> getRenderer() { + public Supplier> getRenderer() { return TaserItemRenderer::new; }