From 9978935a4ac9ccc87f64d7c7e060ab27f77c7a30 Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Sun, 18 May 2025 16:50:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E7=90=86=E9=83=A8=E5=88=86=E5=86=97?= =?UTF-8?q?=E4=BD=99=E4=BB=A3=E7=A0=81=EF=BC=8C=E6=8F=90=E5=8F=96=E6=B8=B2?= =?UTF-8?q?=E6=9F=93=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../superbwarfare/client/CustomRenderer.java | 26 ++++++++++++++ .../renderer/item/BocekItemRenderer.java | 33 ----------------- .../renderer/item/Glock17ItemRenderer.java | 33 ----------------- .../renderer/item/Glock18ItemRenderer.java | 33 ----------------- .../item/HuntingRifleItemRenderer.java | 33 ----------------- .../client/renderer/item/K98ItemRenderer.java | 33 ----------------- .../client/renderer/item/M4ItemRenderer.java | 33 ----------------- .../renderer/item/MarlinItemRenderer.java | 33 ----------------- .../renderer/item/MinigunItemRenderer.java | 33 ----------------- .../renderer/item/Mp443ItemRenderer.java | 33 ----------------- .../item/SecondaryCataclysmRenderer.java | 35 ------------------- .../renderer/item/SentinelItemRenderer.java | 33 ----------------- .../item/gun/handgun/Glock17Item.java | 6 ---- .../item/gun/handgun/Glock18Item.java | 6 ---- .../item/gun/handgun/Mp443Item.java | 6 ---- .../item/gun/launcher/SecondaryCataclysm.java | 8 +---- .../item/gun/machinegun/MinigunItem.java | 6 ---- .../superbwarfare/item/gun/rifle/M4Item.java | 6 ---- .../item/gun/rifle/MarlinItem.java | 32 ++++++----------- .../item/gun/sniper/HuntingRifleItem.java | 6 ---- .../item/gun/sniper/K98Item.java | 6 ---- .../item/gun/sniper/SentinelItem.java | 8 +---- .../item/gun/special/BocekItem.java | 6 ---- 23 files changed, 39 insertions(+), 448 deletions(-) diff --git a/src/main/java/com/atsuishio/superbwarfare/client/CustomRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/CustomRenderer.java index 851aedff3..2d817cb15 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/CustomRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/CustomRenderer.java @@ -6,6 +6,8 @@ import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemDisplayContext; +import net.minecraft.world.item.ItemStack; import org.jetbrains.annotations.Nullable; import org.joml.Matrix4f; import software.bernie.geckolib.animatable.GeoAnimatable; @@ -18,10 +20,34 @@ import software.bernie.geckolib.util.RenderUtil; public class CustomRenderer extends GeoItemRenderer { + protected T animatable; + protected boolean renderArms = false; + protected MultiBufferSource currentBuffer; + protected RenderType renderType; + public ItemDisplayContext transformType; + public CustomRenderer(GeoModel model) { super(model); } + @Override + public void renderByItem(ItemStack stack, ItemDisplayContext transformType, PoseStack matrixStack, MultiBufferSource bufferIn, int combinedLightIn, int p_239207_6_) { + this.transformType = transformType; + super.renderByItem(stack, transformType, matrixStack, bufferIn, combinedLightIn, p_239207_6_); + } + + @Override + public void actuallyRender(PoseStack matrixStackIn, T animatable, BakedGeoModel model, RenderType type, MultiBufferSource renderTypeBuffer, VertexConsumer vertexBuilder, boolean isRenderer, float partialTicks, int packedLightIn, + int packedOverlayIn, int color) { + this.currentBuffer = renderTypeBuffer; + this.renderType = type; + this.animatable = animatable; + super.actuallyRender(matrixStackIn, animatable, model, type, renderTypeBuffer, vertexBuilder, isRenderer, partialTicks, packedLightIn, packedOverlayIn, color); + if (this.renderArms) { + this.renderArms = false; + } + } + @Override public void defaultRender(PoseStack poseStack, T animatable, MultiBufferSource bufferSource, @Nullable RenderType renderType, @Nullable VertexConsumer buffer, float yaw, float partialTick, int packedLight) { poseStack.pushPose(); 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 c07601e30..3763dc9c5 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 @@ -16,16 +16,11 @@ import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.FastColor; -import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import org.joml.Matrix4f; -import software.bernie.geckolib.cache.object.BakedGeoModel; import software.bernie.geckolib.cache.object.GeoBone; import software.bernie.geckolib.util.RenderUtil; -import java.util.HashSet; -import java.util.Set; - public class BocekItemRenderer extends CustomRenderer { public BocekItemRenderer() { @@ -38,12 +33,6 @@ public class BocekItemRenderer extends CustomRenderer { } private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; - protected boolean renderArms = false; - protected MultiBufferSource currentBuffer; - protected RenderType renderType; - public ItemDisplayContext transformType; - protected BocekItem animatable; - private final Set hiddenBones = new HashSet<>(); @Override public void illuminatedRender(PoseStack poseStack, BocekItem animatable, GeoBone bone, RenderType renderType, MultiBufferSource bufferSource, VertexConsumer buffer, float partialTick, int packedLight, @@ -73,26 +62,6 @@ public class BocekItemRenderer extends CustomRenderer { poseStack.popPose(); } - @Override - public void renderByItem(ItemStack stack, ItemDisplayContext transformType, PoseStack matrixStack, MultiBufferSource bufferIn, int combinedLightIn, int p_239207_6_) { - this.transformType = transformType; - if (this.animatable != null) - this.animatable.getTransformType(transformType); - super.renderByItem(stack, transformType, matrixStack, bufferIn, combinedLightIn, p_239207_6_); - } - - @Override - public void actuallyRender(PoseStack matrixStackIn, BocekItem animatable, BakedGeoModel model, RenderType type, MultiBufferSource renderTypeBuffer, VertexConsumer vertexBuilder, boolean isRenderer, float partialTicks, int packedLightIn, - int packedOverlayIn, int color) { - this.currentBuffer = renderTypeBuffer; - this.renderType = type; - this.animatable = animatable; - super.actuallyRender(matrixStackIn, animatable, model, type, renderTypeBuffer, vertexBuilder, isRenderer, partialTicks, packedLightIn, packedOverlayIn, color); - if (this.renderArms) { - this.renderArms = false; - } - } - @Override public void renderRecursively(PoseStack stack, BocekItem animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, int color) { Minecraft mc = Minecraft.getInstance(); @@ -101,8 +70,6 @@ public class BocekItemRenderer extends CustomRenderer { if (name.equals("Lefthand") || name.equals("Righthand")) { bone.setHidden(true); renderingArms = true; - } else { - bone.setHidden(this.hiddenBones.contains(name)); } var player = mc.player; 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 ccc80d48d..9361324e4 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 @@ -11,14 +11,9 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; -import software.bernie.geckolib.cache.object.BakedGeoModel; import software.bernie.geckolib.cache.object.GeoBone; -import java.util.HashSet; -import java.util.Set; - public class Glock17ItemRenderer extends CustomRenderer { public Glock17ItemRenderer() { @@ -31,32 +26,6 @@ public class Glock17ItemRenderer extends CustomRenderer { } private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; - protected boolean renderArms = false; - protected MultiBufferSource currentBuffer; - protected RenderType renderType; - public ItemDisplayContext transformType; - protected Glock17Item animatable; - private final Set hiddenBones = new HashSet<>(); - - @Override - public void renderByItem(ItemStack stack, ItemDisplayContext transformType, PoseStack matrixStack, MultiBufferSource bufferIn, int combinedLightIn, int p_239207_6_) { - this.transformType = transformType; - if (this.animatable != null) - this.animatable.getTransformType(transformType); - super.renderByItem(stack, transformType, matrixStack, bufferIn, combinedLightIn, p_239207_6_); - } - - @Override - public void actuallyRender(PoseStack matrixStackIn, Glock17Item animatable, BakedGeoModel model, RenderType type, MultiBufferSource renderTypeBuffer, VertexConsumer vertexBuilder, boolean isRenderer, float partialTicks, int packedLightIn, - int packedOverlayIn, int color) { - this.currentBuffer = renderTypeBuffer; - this.renderType = type; - this.animatable = animatable; - super.actuallyRender(matrixStackIn, animatable, model, type, renderTypeBuffer, vertexBuilder, isRenderer, partialTicks, packedLightIn, packedOverlayIn, color); - if (this.renderArms) { - this.renderArms = false; - } - } @Override public void renderRecursively(PoseStack stack, Glock17Item animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, int color) { @@ -66,8 +35,6 @@ public class Glock17ItemRenderer extends CustomRenderer { if (name.equals("Lefthand") || name.equals("Righthand")) { bone.setHidden(true); renderingArms = true; - } else { - bone.setHidden(this.hiddenBones.contains(name)); } var player = mc.player; 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 e7403b8c3..849f4ad2f 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 @@ -11,14 +11,9 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; -import software.bernie.geckolib.cache.object.BakedGeoModel; import software.bernie.geckolib.cache.object.GeoBone; -import java.util.HashSet; -import java.util.Set; - public class Glock18ItemRenderer extends CustomRenderer { public Glock18ItemRenderer() { @@ -31,32 +26,6 @@ public class Glock18ItemRenderer extends CustomRenderer { } private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; - protected boolean renderArms = false; - protected MultiBufferSource currentBuffer; - protected RenderType renderType; - public ItemDisplayContext transformType; - protected Glock18Item animatable; - private final Set hiddenBones = new HashSet<>(); - - @Override - public void renderByItem(ItemStack stack, ItemDisplayContext transformType, PoseStack matrixStack, MultiBufferSource bufferIn, int combinedLightIn, int p_239207_6_) { - this.transformType = transformType; - if (this.animatable != null) - this.animatable.getTransformType(transformType); - super.renderByItem(stack, transformType, matrixStack, bufferIn, combinedLightIn, p_239207_6_); - } - - @Override - public void actuallyRender(PoseStack matrixStackIn, Glock18Item animatable, BakedGeoModel model, RenderType type, MultiBufferSource renderTypeBuffer, VertexConsumer vertexBuilder, boolean isRenderer, float partialTicks, int packedLightIn, - int packedOverlayIn, int color) { - this.currentBuffer = renderTypeBuffer; - this.renderType = type; - this.animatable = animatable; - super.actuallyRender(matrixStackIn, animatable, model, type, renderTypeBuffer, vertexBuilder, isRenderer, partialTicks, packedLightIn, packedOverlayIn, color); - if (this.renderArms) { - this.renderArms = false; - } - } @Override public void renderRecursively(PoseStack stack, Glock18Item animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, int color) { @@ -66,8 +35,6 @@ public class Glock18ItemRenderer extends CustomRenderer { if (name.equals("Lefthand") || name.equals("Righthand")) { bone.setHidden(true); renderingArms = true; - } else { - bone.setHidden(this.hiddenBones.contains(name)); } var player = mc.player; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/HuntingRifleItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/HuntingRifleItemRenderer.java index 1ce15be10..c6e6877cb 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/HuntingRifleItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/HuntingRifleItemRenderer.java @@ -11,14 +11,9 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; -import software.bernie.geckolib.cache.object.BakedGeoModel; import software.bernie.geckolib.cache.object.GeoBone; -import java.util.HashSet; -import java.util.Set; - public class HuntingRifleItemRenderer extends CustomRenderer { public HuntingRifleItemRenderer() { @@ -31,32 +26,6 @@ public class HuntingRifleItemRenderer extends CustomRenderer { } private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; - protected boolean renderArms = false; - protected MultiBufferSource currentBuffer; - protected RenderType renderType; - public ItemDisplayContext transformType; - protected HuntingRifleItem animatable; - private final Set hiddenBones = new HashSet<>(); - - @Override - public void renderByItem(ItemStack stack, ItemDisplayContext transformType, PoseStack matrixStack, MultiBufferSource bufferIn, int combinedLightIn, int p_239207_6_) { - this.transformType = transformType; - if (this.animatable != null) - this.animatable.getTransformType(transformType); - super.renderByItem(stack, transformType, matrixStack, bufferIn, combinedLightIn, p_239207_6_); - } - - @Override - public void actuallyRender(PoseStack matrixStackIn, HuntingRifleItem animatable, BakedGeoModel model, RenderType type, MultiBufferSource renderTypeBuffer, VertexConsumer vertexBuilder, boolean isRenderer, float partialTicks, int packedLightIn, - int packedOverlayIn, int color) { - this.currentBuffer = renderTypeBuffer; - this.renderType = type; - this.animatable = animatable; - super.actuallyRender(matrixStackIn, animatable, model, type, renderTypeBuffer, vertexBuilder, isRenderer, partialTicks, packedLightIn, packedOverlayIn, color); - if (this.renderArms) { - this.renderArms = false; - } - } @Override public void renderRecursively(PoseStack stack, HuntingRifleItem animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, int color) { @@ -66,8 +35,6 @@ public class HuntingRifleItemRenderer extends CustomRenderer { if (name.equals("Lefthand") || name.equals("Righthand")) { bone.setHidden(true); renderingArms = true; - } else { - bone.setHidden(this.hiddenBones.contains(name)); } var player = mc.player; 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 6f1b1e70d..68bd03a37 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 @@ -11,14 +11,9 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; -import software.bernie.geckolib.cache.object.BakedGeoModel; import software.bernie.geckolib.cache.object.GeoBone; -import java.util.HashSet; -import java.util.Set; - public class K98ItemRenderer extends CustomRenderer { public K98ItemRenderer() { @@ -31,32 +26,6 @@ public class K98ItemRenderer extends CustomRenderer { } private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; - protected boolean renderArms = false; - protected MultiBufferSource currentBuffer; - protected RenderType renderType; - public ItemDisplayContext transformType; - protected K98Item animatable; - private final Set hiddenBones = new HashSet<>(); - - @Override - public void renderByItem(ItemStack stack, ItemDisplayContext transformType, PoseStack matrixStack, MultiBufferSource bufferIn, int combinedLightIn, int p_239207_6_) { - this.transformType = transformType; - if (this.animatable != null) - this.animatable.getTransformType(transformType); - super.renderByItem(stack, transformType, matrixStack, bufferIn, combinedLightIn, p_239207_6_); - } - - @Override - public void actuallyRender(PoseStack matrixStackIn, K98Item animatable, BakedGeoModel model, RenderType type, MultiBufferSource renderTypeBuffer, VertexConsumer vertexBuilder, boolean isRenderer, float partialTicks, int packedLightIn, - int packedOverlayIn, int color) { - this.currentBuffer = renderTypeBuffer; - this.renderType = type; - this.animatable = animatable; - super.actuallyRender(matrixStackIn, animatable, model, type, renderTypeBuffer, vertexBuilder, isRenderer, partialTicks, packedLightIn, packedOverlayIn, color); - if (this.renderArms) { - this.renderArms = false; - } - } @Override public void renderRecursively(PoseStack stack, K98Item animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, int color) { @@ -66,8 +35,6 @@ public class K98ItemRenderer extends CustomRenderer { if (name.equals("Lefthand") || name.equals("Righthand")) { bone.setHidden(true); renderingArms = true; - } else { - bone.setHidden(this.hiddenBones.contains(name)); } var player = mc.player; 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 c3abe8576..cb27c5a5f 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 @@ -16,14 +16,9 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; -import software.bernie.geckolib.cache.object.BakedGeoModel; import software.bernie.geckolib.cache.object.GeoBone; -import java.util.HashSet; -import java.util.Set; - public class M4ItemRenderer extends CustomRenderer { public M4ItemRenderer() { @@ -36,32 +31,6 @@ public class M4ItemRenderer extends CustomRenderer { } private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; - protected boolean renderArms = false; - protected MultiBufferSource currentBuffer; - protected RenderType renderType; - public ItemDisplayContext transformType; - protected M4Item animatable; - private final Set hiddenBones = new HashSet<>(); - - @Override - public void renderByItem(ItemStack stack, ItemDisplayContext transformType, PoseStack matrixStack, MultiBufferSource bufferIn, int combinedLightIn, int p_239207_6_) { - this.transformType = transformType; - if (this.animatable != null) - this.animatable.getTransformType(transformType); - super.renderByItem(stack, transformType, matrixStack, bufferIn, combinedLightIn, p_239207_6_); - } - - @Override - public void actuallyRender(PoseStack matrixStackIn, M4Item animatable, BakedGeoModel model, RenderType type, MultiBufferSource renderTypeBuffer, VertexConsumer vertexBuilder, boolean isRenderer, float partialTicks, int packedLightIn, - int packedOverlayIn, int color) { - this.currentBuffer = renderTypeBuffer; - this.renderType = type; - this.animatable = animatable; - super.actuallyRender(matrixStackIn, animatable, model, type, renderTypeBuffer, vertexBuilder, isRenderer, partialTicks, packedLightIn, packedOverlayIn, color); - if (this.renderArms) { - this.renderArms = false; - } - } @Override public void renderRecursively(PoseStack stack, M4Item animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, int color) { @@ -71,8 +40,6 @@ public class M4ItemRenderer extends CustomRenderer { if (name.equals("Lefthand") || name.equals("Righthand")) { bone.setHidden(true); renderingArms = true; - } else { - bone.setHidden(this.hiddenBones.contains(name)); } var player = mc.player; 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 bbe14ae0b..f64cf736f 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 @@ -11,14 +11,9 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; -import software.bernie.geckolib.cache.object.BakedGeoModel; import software.bernie.geckolib.cache.object.GeoBone; -import java.util.HashSet; -import java.util.Set; - public class MarlinItemRenderer extends CustomRenderer { public MarlinItemRenderer() { @@ -31,32 +26,6 @@ public class MarlinItemRenderer extends CustomRenderer { } private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; - protected boolean renderArms = false; - protected MultiBufferSource currentBuffer; - protected RenderType renderType; - public ItemDisplayContext transformType; - protected MarlinItem animatable; - private final Set hiddenBones = new HashSet<>(); - - @Override - public void renderByItem(ItemStack stack, ItemDisplayContext transformType, PoseStack matrixStack, MultiBufferSource bufferIn, int combinedLightIn, int p_239207_6_) { - this.transformType = transformType; - if (this.animatable != null) - this.animatable.getTransformType(transformType); - super.renderByItem(stack, transformType, matrixStack, bufferIn, combinedLightIn, p_239207_6_); - } - - @Override - public void actuallyRender(PoseStack matrixStackIn, MarlinItem animatable, BakedGeoModel model, RenderType type, MultiBufferSource renderTypeBuffer, VertexConsumer vertexBuilder, boolean isRenderer, float partialTicks, int packedLightIn, - int packedOverlayIn, int color) { - this.currentBuffer = renderTypeBuffer; - this.renderType = type; - this.animatable = animatable; - super.actuallyRender(matrixStackIn, animatable, model, type, renderTypeBuffer, vertexBuilder, isRenderer, partialTicks, packedLightIn, packedOverlayIn, color); - if (this.renderArms) { - this.renderArms = false; - } - } @Override public void renderRecursively(PoseStack stack, MarlinItem animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, int color) { @@ -66,8 +35,6 @@ public class MarlinItemRenderer extends CustomRenderer { if (name.equals("Lefthand") || name.equals("Righthand")) { bone.setHidden(true); renderingArms = true; - } else { - bone.setHidden(this.hiddenBones.contains(name)); } var player = mc.player; 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 30e74b93f..ad09ea7b7 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 @@ -12,14 +12,9 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; -import software.bernie.geckolib.cache.object.BakedGeoModel; import software.bernie.geckolib.cache.object.GeoBone; -import java.util.HashSet; -import java.util.Set; - public class MinigunItemRenderer extends CustomRenderer { public MinigunItemRenderer() { @@ -32,32 +27,6 @@ public class MinigunItemRenderer extends CustomRenderer { } private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; - protected boolean renderArms = false; - protected MultiBufferSource currentBuffer; - protected RenderType renderType; - public ItemDisplayContext transformType; - protected MinigunItem animatable; - private final Set hiddenBones = new HashSet<>(); - - @Override - public void renderByItem(ItemStack stack, ItemDisplayContext transformType, PoseStack matrixStack, MultiBufferSource bufferIn, int combinedLightIn, int p_239207_6_) { - this.transformType = transformType; - if (this.animatable != null) - this.animatable.getTransformType(transformType); - super.renderByItem(stack, transformType, matrixStack, bufferIn, combinedLightIn, p_239207_6_); - } - - @Override - public void actuallyRender(PoseStack matrixStackIn, MinigunItem animatable, BakedGeoModel model, RenderType type, MultiBufferSource renderTypeBuffer, VertexConsumer vertexBuilder, boolean isRenderer, float partialTicks, int packedLightIn, - int packedOverlayIn, int color) { - this.currentBuffer = renderTypeBuffer; - this.renderType = type; - this.animatable = animatable; - super.actuallyRender(matrixStackIn, animatable, model, type, renderTypeBuffer, vertexBuilder, isRenderer, partialTicks, packedLightIn, packedOverlayIn, color); - if (this.renderArms) { - this.renderArms = false; - } - } @Override public void renderRecursively(PoseStack stack, MinigunItem animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, int color) { @@ -67,8 +36,6 @@ public class MinigunItemRenderer extends CustomRenderer { if (name.equals("Lefthand") || name.equals("Righthand")) { bone.setHidden(true); renderingArms = true; - } else { - bone.setHidden(this.hiddenBones.contains(name)); } var player = mc.player; 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 96a5f0b37..0251760c3 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 @@ -11,14 +11,9 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; -import software.bernie.geckolib.cache.object.BakedGeoModel; import software.bernie.geckolib.cache.object.GeoBone; -import java.util.HashSet; -import java.util.Set; - public class Mp443ItemRenderer extends CustomRenderer { public Mp443ItemRenderer() { @@ -31,32 +26,6 @@ public class Mp443ItemRenderer extends CustomRenderer { } private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; - protected boolean renderArms = false; - protected MultiBufferSource currentBuffer; - protected RenderType renderType; - public ItemDisplayContext transformType; - protected Mp443Item animatable; - private final Set hiddenBones = new HashSet<>(); - - @Override - public void renderByItem(ItemStack stack, ItemDisplayContext transformType, PoseStack matrixStack, MultiBufferSource bufferIn, int combinedLightIn, int p_239207_6_) { - this.transformType = transformType; - if (this.animatable != null) - this.animatable.getTransformType(transformType); - super.renderByItem(stack, transformType, matrixStack, bufferIn, combinedLightIn, p_239207_6_); - } - - @Override - public void actuallyRender(PoseStack matrixStackIn, Mp443Item animatable, BakedGeoModel model, RenderType type, MultiBufferSource renderTypeBuffer, VertexConsumer vertexBuilder, boolean isRenderer, float partialTicks, int packedLightIn, - int packedOverlayIn, int color) { - this.currentBuffer = renderTypeBuffer; - this.renderType = type; - this.animatable = animatable; - super.actuallyRender(matrixStackIn, animatable, model, type, renderTypeBuffer, vertexBuilder, isRenderer, partialTicks, packedLightIn, packedOverlayIn, color); - if (this.renderArms) { - this.renderArms = false; - } - } @Override public void renderRecursively(PoseStack stack, Mp443Item animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, int color) { @@ -66,8 +35,6 @@ public class Mp443ItemRenderer extends CustomRenderer { if (name.equals("Lefthand") || name.equals("Righthand")) { bone.setHidden(true); renderingArms = true; - } else { - bone.setHidden(this.hiddenBones.contains(name)); } var player = mc.player; 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 66ebbb024..658fd0feb 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 @@ -11,20 +11,13 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; -import software.bernie.geckolib.cache.object.BakedGeoModel; import software.bernie.geckolib.cache.object.GeoBone; -import java.util.HashSet; -import java.util.Set; - public class SecondaryCataclysmRenderer extends CustomRenderer { public SecondaryCataclysmRenderer() { super(new SecondaryCataclysmModel()); - // TODO layer -// this.addRenderLayer(new SecondaryCataclysmLightLayer(this)); } @Override @@ -33,32 +26,6 @@ public class SecondaryCataclysmRenderer extends CustomRenderer hiddenBones = new HashSet<>(); - - @Override - public void renderByItem(ItemStack stack, ItemDisplayContext transformType, PoseStack matrixStack, MultiBufferSource bufferIn, int combinedLightIn, int p_239207_6_) { - this.transformType = transformType; - if (this.animatable != null) - this.animatable.getTransformType(transformType); - super.renderByItem(stack, transformType, matrixStack, bufferIn, combinedLightIn, p_239207_6_); - } - - @Override - public void actuallyRender(PoseStack matrixStackIn, SecondaryCataclysm animatable, BakedGeoModel model, RenderType type, MultiBufferSource renderTypeBuffer, VertexConsumer vertexBuilder, boolean isRenderer, float partialTicks, int packedLightIn, - int packedOverlayIn, int color) { - this.currentBuffer = renderTypeBuffer; - this.renderType = type; - this.animatable = animatable; - super.actuallyRender(matrixStackIn, animatable, model, type, renderTypeBuffer, vertexBuilder, isRenderer, partialTicks, packedLightIn, packedOverlayIn, color); - if (this.renderArms) { - this.renderArms = false; - } - } @Override public void renderRecursively(PoseStack stack, SecondaryCataclysm animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, int color) { @@ -68,8 +35,6 @@ public class SecondaryCataclysmRenderer extends CustomRenderer { public SentinelItemRenderer() { @@ -32,32 +27,6 @@ public class SentinelItemRenderer extends CustomRenderer { } private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; - protected boolean renderArms = false; - protected MultiBufferSource currentBuffer; - protected RenderType renderType; - public ItemDisplayContext transformType; - protected SentinelItem animatable; - private final Set hiddenBones = new HashSet<>(); - - @Override - public void renderByItem(ItemStack stack, ItemDisplayContext transformType, PoseStack matrixStack, MultiBufferSource bufferIn, int combinedLightIn, int p_239207_6_) { - this.transformType = transformType; - if (this.animatable != null) - this.animatable.getTransformType(transformType); - super.renderByItem(stack, transformType, matrixStack, bufferIn, combinedLightIn, p_239207_6_); - } - - @Override - public void actuallyRender(PoseStack matrixStackIn, SentinelItem animatable, BakedGeoModel model, RenderType type, MultiBufferSource renderTypeBuffer, VertexConsumer vertexBuilder, boolean isRenderer, float partialTicks, int packedLightIn, - int packedOverlayIn, int color) { - this.currentBuffer = renderTypeBuffer; - this.renderType = type; - this.animatable = animatable; - super.actuallyRender(matrixStackIn, animatable, model, type, renderTypeBuffer, vertexBuilder, isRenderer, partialTicks, packedLightIn, packedOverlayIn, color); - if (this.renderArms) { - this.renderArms = false; - } - } @Override public void renderRecursively(PoseStack stack, SentinelItem animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, int color) { @@ -67,8 +36,6 @@ public class SentinelItemRenderer extends CustomRenderer { if (name.equals("Lefthand") || name.equals("Righthand")) { bone.setHidden(true); renderingArms = true; - } else { - bone.setHidden(this.hiddenBones.contains(name)); } var player = mc.player; 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 f6f62d849..a1eeaac5c 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 @@ -11,7 +11,6 @@ import net.minecraft.client.player.LocalPlayer; import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Rarity; import software.bernie.geckolib.animatable.GeoItem; @@ -28,7 +27,6 @@ import java.util.function.Supplier; public class Glock17Item extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); - public static ItemDisplayContext transformType; public Glock17Item() { super(new Properties().stacksTo(1).rarity(Rarity.COMMON)); @@ -39,10 +37,6 @@ public class Glock17Item extends GunItem implements GeoItem { return Glock17ItemRenderer::new; } - public void getTransformType(ItemDisplayContext type) { - transformType = type; - } - private PlayState fireAnimPredicate(AnimationState event) { LocalPlayer player = Minecraft.getInstance().player; if (player == null) return PlayState.STOP; 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 8dcc35555..3463370b8 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 @@ -11,7 +11,6 @@ import net.minecraft.client.player.LocalPlayer; import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Rarity; import software.bernie.geckolib.animatable.GeoItem; @@ -28,7 +27,6 @@ import java.util.function.Supplier; public class Glock18Item extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); - public static ItemDisplayContext transformType; public Glock18Item() { super(new Properties().stacksTo(1).rarity(Rarity.RARE)); @@ -39,10 +37,6 @@ public class Glock18Item extends GunItem implements GeoItem { return Glock18ItemRenderer::new; } - public void getTransformType(ItemDisplayContext type) { - transformType = type; - } - private PlayState fireAnimPredicate(AnimationState event) { LocalPlayer player = Minecraft.getInstance().player; if (player == null) return PlayState.STOP; 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 307638884..3489f9f1f 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 @@ -11,7 +11,6 @@ import net.minecraft.client.player.LocalPlayer; import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Rarity; import software.bernie.geckolib.animatable.GeoItem; @@ -28,7 +27,6 @@ import java.util.function.Supplier; public class Mp443Item extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); - public static ItemDisplayContext transformType; public Mp443Item() { super(new Properties().stacksTo(1).rarity(Rarity.COMMON)); @@ -39,10 +37,6 @@ public class Mp443Item extends GunItem implements GeoItem { return Mp443ItemRenderer::new; } - public void getTransformType(ItemDisplayContext type) { - transformType = type; - } - private PlayState fireAnimPredicate(AnimationState event) { LocalPlayer player = Minecraft.getInstance().player; if (player == null) return PlayState.STOP; 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 2aefd0318..61df6eb2f 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 @@ -3,6 +3,7 @@ package com.atsuishio.superbwarfare.item.gun.launcher; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.renderer.item.SecondaryCataclysmRenderer; import com.atsuishio.superbwarfare.client.tooltip.component.SecondaryCataclysmImageComponent; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.entity.projectile.GunGrenadeEntity; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModEnumExtensions; @@ -10,7 +11,6 @@ import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.item.EnergyStorageItem; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.perk.AmmoPerk; import com.atsuishio.superbwarfare.perk.Perk; import com.atsuishio.superbwarfare.tools.ParticleTool; @@ -26,7 +26,6 @@ import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.tooltip.TooltipComponent; import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.component.ItemAttributeModifiers; import net.minecraft.world.level.Level; @@ -45,7 +44,6 @@ import java.util.function.Supplier; public class SecondaryCataclysm extends GunItem implements GeoItem, EnergyStorageItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); - public static ItemDisplayContext transformType; public SecondaryCataclysm() { super(new Properties().stacksTo(1).fireResistant().rarity(ModEnumExtensions.getLegendary())); @@ -73,10 +71,6 @@ public class SecondaryCataclysm extends GunItem implements GeoItem, EnergyStorag return SecondaryCataclysmRenderer::new; } - public void getTransformType(ItemDisplayContext type) { - transformType = type; - } - private PlayState reloadAnimPredicate(AnimationState event) { LocalPlayer player = Minecraft.getInstance().player; if (player == null) return PlayState.STOP; 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 74c250d1f..3312c5f9c 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 @@ -10,7 +10,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import software.bernie.geckolib.animatable.GeoItem; import software.bernie.geckolib.animatable.instance.AnimatableInstanceCache; @@ -23,7 +22,6 @@ import java.util.function.Supplier; public class MinigunItem extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); - public static ItemDisplayContext transformType; public MinigunItem() { super(new Properties().stacksTo(1).rarity(ModEnumExtensions.getLegendary())); @@ -39,10 +37,6 @@ public class MinigunItem extends GunItem implements GeoItem { return MinigunItemRenderer::new; } - public void getTransformType(ItemDisplayContext type) { - transformType = type; - } - private PlayState idlePredicate(AnimationState event) { LocalPlayer player = Minecraft.getInstance().player; if (player == null) return PlayState.STOP; 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 8831a30de..e7df50ddc 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 @@ -15,7 +15,6 @@ import net.minecraft.client.player.LocalPlayer; import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Rarity; import software.bernie.geckolib.animatable.GeoItem; @@ -30,7 +29,6 @@ import java.util.function.Supplier; public class M4Item extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); - public static ItemDisplayContext transformType; public M4Item() { super(new Properties().stacksTo(1).rarity(Rarity.RARE)); @@ -41,10 +39,6 @@ public class M4Item extends GunItem implements GeoItem { return M4ItemRenderer::new; } - public void getTransformType(ItemDisplayContext type) { - transformType = type; - } - private PlayState idlePredicate(AnimationState event) { LocalPlayer player = Minecraft.getInstance().player; if (player == null) return PlayState.STOP; 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 fd79aeb17..5a6e3c0d3 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 @@ -11,7 +11,6 @@ import net.minecraft.client.player.LocalPlayer; import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Rarity; import software.bernie.geckolib.animatable.GeoItem; @@ -26,7 +25,6 @@ import java.util.function.Supplier; public class MarlinItem extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); - public static ItemDisplayContext transformType; public MarlinItem() { super(new Properties().stacksTo(1).rarity(Rarity.COMMON)); @@ -37,10 +35,6 @@ public class MarlinItem extends GunItem implements GeoItem { return MarlinItemRenderer::new; } - public void getTransformType(ItemDisplayContext type) { - transformType = type; - } - private PlayState fireAnimPredicate(AnimationState event) { LocalPlayer player = Minecraft.getInstance().player; if (player == null) return PlayState.STOP; @@ -78,23 +72,19 @@ public class MarlinItem extends GunItem implements GeoItem { if (!(stack.getItem() instanceof GunItem)) return PlayState.STOP; var data = GunData.from(stack); - if (transformType != null && transformType.firstPerson()) { - if (player.isSprinting() - && player.onGround() - && ClientEventHandler.cantSprint == 0 - && ClientEventHandler.drawTime < 0.01 - && !data.reloading()) { - if (ClientEventHandler.tacticalSprint) { - return event.setAndContinue(RawAnimation.begin().thenLoop("animation.marlin.run_fast")); - } else { - return event.setAndContinue(RawAnimation.begin().thenLoop("animation.marlin.run")); - } + if (player.isSprinting() && player.onGround() + && ClientEventHandler.cantSprint == 0 + && ClientEventHandler.drawTime < 0.01 + && !data.reloading()) { + if (ClientEventHandler.tacticalSprint) { + return event.setAndContinue(RawAnimation.begin().thenLoop("animation.marlin.run_fast")); + } else { + return event.setAndContinue(RawAnimation.begin().thenLoop("animation.marlin.run")); } - - event.getController().setAnimation(RawAnimation.begin().thenLoop("animation.marlin.idle")); - return PlayState.CONTINUE; } - return PlayState.STOP; + + event.getController().setAnimation(RawAnimation.begin().thenLoop("animation.marlin.idle")); + return PlayState.CONTINUE; } @Override 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 bd36d0234..603f11330 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 @@ -11,7 +11,6 @@ import net.minecraft.client.player.LocalPlayer; import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Rarity; import software.bernie.geckolib.animatable.GeoItem; @@ -26,7 +25,6 @@ import java.util.function.Supplier; public class HuntingRifleItem extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); - public static ItemDisplayContext transformType; public HuntingRifleItem() { super(new Properties().stacksTo(1).rarity(Rarity.EPIC)); @@ -42,10 +40,6 @@ public class HuntingRifleItem extends GunItem implements GeoItem { return HuntingRifleItemRenderer::new; } - public void getTransformType(ItemDisplayContext type) { - transformType = type; - } - private PlayState idlePredicate(AnimationState event) { LocalPlayer player = Minecraft.getInstance().player; if (player == null) return PlayState.STOP; 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 2b36d798a..a5a7f554a 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 @@ -11,7 +11,6 @@ import net.minecraft.client.player.LocalPlayer; import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Rarity; import software.bernie.geckolib.animatable.GeoItem; @@ -26,7 +25,6 @@ import java.util.function.Supplier; public class K98Item extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); - public static ItemDisplayContext transformType; public K98Item() { super(new Properties().stacksTo(1).rarity(Rarity.RARE)); @@ -37,10 +35,6 @@ public class K98Item extends GunItem implements GeoItem { return K98ItemRenderer::new; } - public void getTransformType(ItemDisplayContext type) { - transformType = type; - } - private PlayState fireAnimPredicate(AnimationState event) { LocalPlayer player = Minecraft.getInstance().player; if (player == null) return PlayState.STOP; 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 124debfc0..7fe0165e7 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 @@ -3,12 +3,12 @@ package com.atsuishio.superbwarfare.item.gun.sniper; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.client.renderer.item.SentinelItemRenderer; import com.atsuishio.superbwarfare.client.tooltip.component.SentinelImageComponent; +import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModEnumExtensions; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.item.EnergyStorageItem; import com.atsuishio.superbwarfare.item.gun.GunItem; -import com.atsuishio.superbwarfare.data.gun.GunData; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; import net.minecraft.resources.ResourceLocation; @@ -17,7 +17,6 @@ import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.tooltip.TooltipComponent; import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.neoforged.neoforge.capabilities.Capabilities; @@ -35,7 +34,6 @@ import java.util.function.Supplier; public class SentinelItem extends GunItem implements GeoItem, EnergyStorageItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); - public static ItemDisplayContext transformType; public SentinelItem() { super(new Properties().stacksTo(1).rarity(ModEnumExtensions.getLegendary())); @@ -64,10 +62,6 @@ public class SentinelItem extends GunItem implements GeoItem, EnergyStorageItem return SentinelItemRenderer::new; } - public void getTransformType(ItemDisplayContext type) { - transformType = type; - } - private PlayState fireAnimPredicate(AnimationState event) { LocalPlayer player = Minecraft.getInstance().player; if (player == null) return PlayState.STOP; 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 f3506a96c..1ca4c1136 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 @@ -23,7 +23,6 @@ import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.tooltip.TooltipComponent; import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Rarity; import net.minecraft.world.level.Level; @@ -42,7 +41,6 @@ import java.util.function.Supplier; public class BocekItem extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); - public static ItemDisplayContext transformType; public BocekItem() { super(new Properties().stacksTo(1).rarity(Rarity.EPIC)); @@ -53,10 +51,6 @@ public class BocekItem extends GunItem implements GeoItem { return BocekItemRenderer::new; } - public void getTransformType(ItemDisplayContext type) { - transformType = type; - } - private PlayState idlePredicate(AnimationState event) { LocalPlayer player = Minecraft.getInstance().player; if (player == null) return PlayState.STOP;