diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Mk14ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Mk14ItemRenderer.java index 0b5c8ba63..056421d73 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Mk14ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Mk14ItemRenderer.java @@ -1,6 +1,7 @@ package com.atsuishio.superbwarfare.client.renderer.gun; import com.atsuishio.superbwarfare.client.AnimationHelper; +import com.atsuishio.superbwarfare.client.CustomGunRenderer; import com.atsuishio.superbwarfare.client.ItemModelHelper; import com.atsuishio.superbwarfare.client.model.item.Mk14ItemModel; import com.atsuishio.superbwarfare.data.gun.GunData; @@ -13,55 +14,15 @@ 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.resources.ResourceLocation; -import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; -import software.bernie.geckolib.cache.object.BakedGeoModel; import software.bernie.geckolib.cache.object.GeoBone; -import software.bernie.geckolib.renderer.GeoItemRenderer; -import java.util.HashSet; -import java.util.Set; - -public class Mk14ItemRenderer extends GeoItemRenderer { +public class Mk14ItemRenderer extends CustomGunRenderer { public Mk14ItemRenderer() { super(new Mk14ItemModel()); } - @Override - public RenderType getRenderType(Mk14Item animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { - return RenderType.entityTranslucent(getTextureLocation(animatable)); - } - - private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; - protected boolean renderArms = false; - protected MultiBufferSource currentBuffer; - protected RenderType renderType; - public ItemDisplayContext transformType; - protected Mk14Item 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, Mk14Item 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, Mk14Item animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, int color) { Minecraft mc = Minecraft.getInstance(); @@ -70,8 +31,6 @@ public class Mk14ItemRenderer extends GeoItemRenderer { if (name.equals("Lefthand") || name.equals("Righthand")) { bone.setHidden(true); renderingArms = true; - } else { - bone.setHidden(this.hiddenBones.contains(name)); } var player = mc.player; @@ -113,9 +72,4 @@ public class Mk14ItemRenderer extends GeoItemRenderer { } super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); } - - @Override - public ResourceLocation getTextureLocation(Mk14Item instance) { - return super.getTextureLocation(instance); - } } \ No newline at end of file diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/MosinNagantItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/MosinNagantItemRenderer.java index f9099fcba..0839cdcac 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/MosinNagantItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/MosinNagantItemRenderer.java @@ -1,6 +1,7 @@ package com.atsuishio.superbwarfare.client.renderer.gun; import com.atsuishio.superbwarfare.client.AnimationHelper; +import com.atsuishio.superbwarfare.client.CustomGunRenderer; import com.atsuishio.superbwarfare.client.model.item.MosinNagantItemModel; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.item.gun.GunItem; @@ -10,55 +11,15 @@ 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.resources.ResourceLocation; -import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; -import software.bernie.geckolib.cache.object.BakedGeoModel; import software.bernie.geckolib.cache.object.GeoBone; -import software.bernie.geckolib.renderer.GeoItemRenderer; -import java.util.HashSet; -import java.util.Set; - -public class MosinNagantItemRenderer extends GeoItemRenderer { +public class MosinNagantItemRenderer extends CustomGunRenderer { public MosinNagantItemRenderer() { super(new MosinNagantItemModel()); } - @Override - public RenderType getRenderType(MosinNagantItem animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { - return RenderType.entityTranslucent(getTextureLocation(animatable)); - } - - private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; - protected boolean renderArms = false; - protected MultiBufferSource currentBuffer; - protected RenderType renderType; - public ItemDisplayContext transformType; - protected MosinNagantItem 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, MosinNagantItem 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, MosinNagantItem animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, int color) { Minecraft mc = Minecraft.getInstance(); @@ -67,8 +28,6 @@ public class MosinNagantItemRenderer extends GeoItemRenderer { if (name.equals("Lefthand") || name.equals("Righthand")) { bone.setHidden(true); renderingArms = true; - } else { - bone.setHidden(this.hiddenBones.contains(name)); } var player = mc.player; @@ -76,7 +35,6 @@ public class MosinNagantItemRenderer extends GeoItemRenderer { ItemStack itemStack = player.getMainHandItem(); if (!(itemStack.getItem() instanceof GunItem)) return; - if (name.equals("jia") || name.equals("b1") || name.equals("b2")) { bone.setHidden(ClientEventHandler.zoomPos > 0.7); } @@ -90,9 +48,4 @@ public class MosinNagantItemRenderer extends GeoItemRenderer { } super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); } - - @Override - public ResourceLocation getTextureLocation(MosinNagantItem instance) { - return super.getTextureLocation(instance); - } } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Ntw20Renderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Ntw20Renderer.java index 137cd60d3..71b336fe2 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Ntw20Renderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Ntw20Renderer.java @@ -1,6 +1,7 @@ package com.atsuishio.superbwarfare.client.renderer.gun; import com.atsuishio.superbwarfare.client.AnimationHelper; +import com.atsuishio.superbwarfare.client.CustomGunRenderer; import com.atsuishio.superbwarfare.client.ItemModelHelper; import com.atsuishio.superbwarfare.client.model.item.Ntw20Model; import com.atsuishio.superbwarfare.data.gun.GunData; @@ -13,55 +14,15 @@ 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.resources.ResourceLocation; -import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; -import software.bernie.geckolib.cache.object.BakedGeoModel; import software.bernie.geckolib.cache.object.GeoBone; -import software.bernie.geckolib.renderer.GeoItemRenderer; -import java.util.HashSet; -import java.util.Set; - -public class Ntw20Renderer extends GeoItemRenderer { +public class Ntw20Renderer extends CustomGunRenderer { public Ntw20Renderer() { super(new Ntw20Model()); } - @Override - public RenderType getRenderType(Ntw20Item animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { - return RenderType.entityTranslucent(getTextureLocation(animatable)); - } - - private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; - protected boolean renderArms = false; - protected MultiBufferSource currentBuffer; - protected RenderType renderType; - public ItemDisplayContext transformType; - protected Ntw20Item 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, Ntw20Item 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, Ntw20Item animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, int color) { Minecraft mc = Minecraft.getInstance(); @@ -70,8 +31,6 @@ public class Ntw20Renderer extends GeoItemRenderer { if (name.equals("Lefthand") || name.equals("Righthand")) { bone.setHidden(true); renderingArms = true; - } else { - bone.setHidden(this.hiddenBones.contains(name)); } var player = mc.player; @@ -113,9 +72,4 @@ public class Ntw20Renderer extends GeoItemRenderer { } super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); } - - @Override - public ResourceLocation getTextureLocation(Ntw20Item instance) { - return super.getTextureLocation(instance); - } } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Qbz95ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Qbz95ItemRenderer.java index 0f7c81834..5f42bf17b 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Qbz95ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/Qbz95ItemRenderer.java @@ -1,6 +1,7 @@ package com.atsuishio.superbwarfare.client.renderer.gun; import com.atsuishio.superbwarfare.client.AnimationHelper; +import com.atsuishio.superbwarfare.client.CustomGunRenderer; import com.atsuishio.superbwarfare.client.ItemModelHelper; import com.atsuishio.superbwarfare.client.model.item.Qbz95ItemModel; import com.atsuishio.superbwarfare.data.gun.GunData; @@ -13,55 +14,15 @@ 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.resources.ResourceLocation; -import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; -import software.bernie.geckolib.cache.object.BakedGeoModel; import software.bernie.geckolib.cache.object.GeoBone; -import software.bernie.geckolib.renderer.GeoItemRenderer; -import java.util.HashSet; -import java.util.Set; - -public class Qbz95ItemRenderer extends GeoItemRenderer { +public class Qbz95ItemRenderer extends CustomGunRenderer { public Qbz95ItemRenderer() { super(new Qbz95ItemModel()); } - @Override - public RenderType getRenderType(Qbz95Item animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { - return RenderType.entityTranslucent(getTextureLocation(animatable)); - } - - private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; - protected boolean renderArms = false; - protected MultiBufferSource currentBuffer; - protected RenderType renderType; - public ItemDisplayContext transformType; - protected Qbz95Item 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, Qbz95Item 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, Qbz95Item animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, int color) { Minecraft mc = Minecraft.getInstance(); @@ -70,8 +31,6 @@ public class Qbz95ItemRenderer extends GeoItemRenderer { if (name.equals("Lefthand") || name.equals("Righthand")) { bone.setHidden(true); renderingArms = true; - } else { - bone.setHidden(this.hiddenBones.contains(name)); } var player = mc.player; @@ -121,9 +80,4 @@ public class Qbz95ItemRenderer extends GeoItemRenderer { } super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); } - - @Override - public ResourceLocation getTextureLocation(Qbz95Item instance) { - return super.getTextureLocation(instance); - } } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/RpgItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/RpgItemRenderer.java index f9c406700..84eb46d6f 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/RpgItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/RpgItemRenderer.java @@ -1,6 +1,7 @@ package com.atsuishio.superbwarfare.client.renderer.gun; import com.atsuishio.superbwarfare.client.AnimationHelper; +import com.atsuishio.superbwarfare.client.CustomGunRenderer; import com.atsuishio.superbwarfare.client.model.item.RpgItemModel; import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.item.gun.GunItem; @@ -10,55 +11,15 @@ 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.resources.ResourceLocation; -import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; -import software.bernie.geckolib.cache.object.BakedGeoModel; import software.bernie.geckolib.cache.object.GeoBone; -import software.bernie.geckolib.renderer.GeoItemRenderer; -import java.util.HashSet; -import java.util.Set; - -public class RpgItemRenderer extends GeoItemRenderer { +public class RpgItemRenderer extends CustomGunRenderer { public RpgItemRenderer() { super(new RpgItemModel()); } - @Override - public RenderType getRenderType(RpgItem animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { - return RenderType.entityTranslucent(getTextureLocation(animatable)); - } - - private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; - protected boolean renderArms = false; - protected MultiBufferSource currentBuffer; - protected RenderType renderType; - public ItemDisplayContext transformType; - protected RpgItem 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, RpgItem 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, RpgItem animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, int color) { Minecraft mc = Minecraft.getInstance(); @@ -67,8 +28,6 @@ public class RpgItemRenderer extends GeoItemRenderer { if (name.equals("Lefthand") || name.equals("Righthand")) { bone.setHidden(true); renderingArms = true; - } else { - bone.setHidden(this.hiddenBones.contains(name)); } var player = mc.player; @@ -87,9 +46,4 @@ public class RpgItemRenderer extends GeoItemRenderer { } super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); } - - @Override - public ResourceLocation getTextureLocation(RpgItem instance) { - return super.getTextureLocation(instance); - } } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/RpkItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/RpkItemRenderer.java index 97b2809fc..c2e68f7e7 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/RpkItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/RpkItemRenderer.java @@ -1,6 +1,7 @@ package com.atsuishio.superbwarfare.client.renderer.gun; import com.atsuishio.superbwarfare.client.AnimationHelper; +import com.atsuishio.superbwarfare.client.CustomGunRenderer; import com.atsuishio.superbwarfare.client.ItemModelHelper; import com.atsuishio.superbwarfare.client.model.item.RpkItemModel; import com.atsuishio.superbwarfare.data.gun.GunData; @@ -13,55 +14,15 @@ 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.resources.ResourceLocation; -import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; -import software.bernie.geckolib.cache.object.BakedGeoModel; import software.bernie.geckolib.cache.object.GeoBone; -import software.bernie.geckolib.renderer.GeoItemRenderer; -import java.util.HashSet; -import java.util.Set; - -public class RpkItemRenderer extends GeoItemRenderer { +public class RpkItemRenderer extends CustomGunRenderer { public RpkItemRenderer() { super(new RpkItemModel()); } - @Override - public RenderType getRenderType(RpkItem animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { - return RenderType.entityTranslucent(getTextureLocation(animatable)); - } - - private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; - protected boolean renderArms = false; - protected MultiBufferSource currentBuffer; - protected RenderType renderType; - public ItemDisplayContext transformType; - protected RpkItem 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, RpkItem 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, RpkItem animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, int color) { Minecraft mc = Minecraft.getInstance(); @@ -70,8 +31,6 @@ public class RpkItemRenderer extends GeoItemRenderer { if (name.equals("Lefthand") || name.equals("Righthand")) { bone.setHidden(true); renderingArms = true; - } else { - bone.setHidden(this.hiddenBones.contains(name)); } var player = mc.player; @@ -124,9 +83,4 @@ public class RpkItemRenderer extends GeoItemRenderer { } super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); } - - @Override - public ResourceLocation getTextureLocation(RpkItem instance) { - return super.getTextureLocation(instance); - } } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/SksItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/SksItemRenderer.java index 28d2e3875..32158589f 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/SksItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/SksItemRenderer.java @@ -1,6 +1,7 @@ package com.atsuishio.superbwarfare.client.renderer.gun; import com.atsuishio.superbwarfare.client.AnimationHelper; +import com.atsuishio.superbwarfare.client.CustomGunRenderer; import com.atsuishio.superbwarfare.client.model.item.SksItemModel; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.item.gun.rifle.SksItem; @@ -9,55 +10,15 @@ 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.resources.ResourceLocation; -import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; -import software.bernie.geckolib.cache.object.BakedGeoModel; import software.bernie.geckolib.cache.object.GeoBone; -import software.bernie.geckolib.renderer.GeoItemRenderer; -import java.util.HashSet; -import java.util.Set; - -public class SksItemRenderer extends GeoItemRenderer { +public class SksItemRenderer extends CustomGunRenderer { public SksItemRenderer() { super(new SksItemModel()); } - @Override - public RenderType getRenderType(SksItem animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { - return RenderType.entityTranslucent(getTextureLocation(animatable)); - } - - private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; - protected boolean renderArms = false; - protected MultiBufferSource currentBuffer; - protected RenderType renderType; - public ItemDisplayContext transformType; - protected SksItem 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, SksItem 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, SksItem animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, int color) { Minecraft mc = Minecraft.getInstance(); @@ -66,8 +27,6 @@ public class SksItemRenderer extends GeoItemRenderer { if (name.equals("Lefthand") || name.equals("Righthand")) { bone.setHidden(true); renderingArms = true; - } else { - bone.setHidden(this.hiddenBones.contains(name)); } var player = mc.player; @@ -84,9 +43,4 @@ public class SksItemRenderer extends GeoItemRenderer { } super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); } - - @Override - public ResourceLocation getTextureLocation(SksItem instance) { - return super.getTextureLocation(instance); - } } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/SvdItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/SvdItemRenderer.java index 62e00fa54..92be32c89 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/SvdItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/SvdItemRenderer.java @@ -1,6 +1,7 @@ package com.atsuishio.superbwarfare.client.renderer.gun; import com.atsuishio.superbwarfare.client.AnimationHelper; +import com.atsuishio.superbwarfare.client.CustomGunRenderer; import com.atsuishio.superbwarfare.client.ItemModelHelper; import com.atsuishio.superbwarfare.client.model.item.SvdItemModel; import com.atsuishio.superbwarfare.data.gun.GunData; @@ -13,55 +14,15 @@ 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.resources.ResourceLocation; -import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; -import software.bernie.geckolib.cache.object.BakedGeoModel; import software.bernie.geckolib.cache.object.GeoBone; -import software.bernie.geckolib.renderer.GeoItemRenderer; -import java.util.HashSet; -import java.util.Set; - -public class SvdItemRenderer extends GeoItemRenderer { +public class SvdItemRenderer extends CustomGunRenderer { public SvdItemRenderer() { super(new SvdItemModel()); } - @Override - public RenderType getRenderType(SvdItem animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { - return RenderType.entityTranslucent(getTextureLocation(animatable)); - } - - private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; - protected boolean renderArms = false; - protected MultiBufferSource currentBuffer; - protected RenderType renderType; - public ItemDisplayContext transformType; - protected SvdItem 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, SvdItem 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, SvdItem animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, int color) { Minecraft mc = Minecraft.getInstance(); @@ -70,8 +31,6 @@ public class SvdItemRenderer extends GeoItemRenderer { if (name.equals("Lefthand") || name.equals("Righthand")) { bone.setHidden(true); renderingArms = true; - } else { - bone.setHidden(this.hiddenBones.contains(name)); } var player = mc.player; @@ -110,9 +69,4 @@ public class SvdItemRenderer extends GeoItemRenderer { } super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); } - - @Override - public ResourceLocation getTextureLocation(SvdItem instance) { - return super.getTextureLocation(instance); - } } \ No newline at end of file diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/TaserItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/TaserItemRenderer.java index 17deee2ba..3dab90bf9 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/TaserItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/TaserItemRenderer.java @@ -1,6 +1,7 @@ package com.atsuishio.superbwarfare.client.renderer.gun; import com.atsuishio.superbwarfare.client.AnimationHelper; +import com.atsuishio.superbwarfare.client.CustomGunRenderer; import com.atsuishio.superbwarfare.client.model.item.TaserItemModel; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.item.gun.special.TaserItem; @@ -9,55 +10,15 @@ 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.resources.ResourceLocation; -import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; -import software.bernie.geckolib.cache.object.BakedGeoModel; import software.bernie.geckolib.cache.object.GeoBone; -import software.bernie.geckolib.renderer.GeoItemRenderer; -import java.util.HashSet; -import java.util.Set; - -public class TaserItemRenderer extends GeoItemRenderer { +public class TaserItemRenderer extends CustomGunRenderer { public TaserItemRenderer() { super(new TaserItemModel()); } - @Override - public RenderType getRenderType(TaserItem animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { - return RenderType.entityTranslucent(getTextureLocation(animatable)); - } - - private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; - protected boolean renderArms = false; - protected MultiBufferSource currentBuffer; - protected RenderType renderType; - public ItemDisplayContext transformType; - protected TaserItem 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, TaserItem 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, TaserItem animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, int color) { Minecraft mc = Minecraft.getInstance(); @@ -66,8 +27,6 @@ public class TaserItemRenderer extends GeoItemRenderer { if (name.equals("Lefthand") || name.equals("Righthand")) { bone.setHidden(true); renderingArms = true; - } else { - bone.setHidden(this.hiddenBones.contains(name)); } var player = mc.player; @@ -80,10 +39,5 @@ public class TaserItemRenderer extends GeoItemRenderer { } super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); } - - @Override - public ResourceLocation getTextureLocation(TaserItem instance) { - return super.getTextureLocation(instance); - } } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/TracheliumItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/TracheliumItemRenderer.java index 25cca44f3..e0ac80c73 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/TracheliumItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/TracheliumItemRenderer.java @@ -1,6 +1,7 @@ package com.atsuishio.superbwarfare.client.renderer.gun; import com.atsuishio.superbwarfare.client.AnimationHelper; +import com.atsuishio.superbwarfare.client.CustomGunRenderer; import com.atsuishio.superbwarfare.client.ItemModelHelper; import com.atsuishio.superbwarfare.client.model.item.TracheliumItemModel; import com.atsuishio.superbwarfare.data.gun.GunData; @@ -14,55 +15,15 @@ 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.resources.ResourceLocation; -import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; -import software.bernie.geckolib.cache.object.BakedGeoModel; import software.bernie.geckolib.cache.object.GeoBone; -import software.bernie.geckolib.renderer.GeoItemRenderer; -import java.util.HashSet; -import java.util.Set; - -public class TracheliumItemRenderer extends GeoItemRenderer { +public class TracheliumItemRenderer extends CustomGunRenderer { public TracheliumItemRenderer() { super(new TracheliumItemModel()); } - @Override - public RenderType getRenderType(Trachelium animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { - return RenderType.entityTranslucent(getTextureLocation(animatable)); - } - - private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; - protected boolean renderArms = false; - protected MultiBufferSource currentBuffer; - protected RenderType renderType; - public ItemDisplayContext transformType; - protected Trachelium 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, Trachelium 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, Trachelium animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, int color) { Minecraft mc = Minecraft.getInstance(); @@ -71,8 +32,6 @@ public class TracheliumItemRenderer extends GeoItemRenderer { if (name.equals("Lefthand") || name.equals("Righthand")) { bone.setHidden(true); renderingArms = true; - } else { - bone.setHidden(this.hiddenBones.contains(name)); } var player = mc.player; @@ -125,9 +84,4 @@ public class TracheliumItemRenderer extends GeoItemRenderer { } super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); } - - @Override - public ResourceLocation getTextureLocation(Trachelium instance) { - return super.getTextureLocation(instance); - } } \ No newline at end of file diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/VectorItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/VectorItemRenderer.java index 4dfa38e6d..f6d3bd000 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/VectorItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/VectorItemRenderer.java @@ -1,6 +1,7 @@ package com.atsuishio.superbwarfare.client.renderer.gun; import com.atsuishio.superbwarfare.client.AnimationHelper; +import com.atsuishio.superbwarfare.client.CustomGunRenderer; import com.atsuishio.superbwarfare.client.ItemModelHelper; import com.atsuishio.superbwarfare.client.model.item.VectorItemModel; import com.atsuishio.superbwarfare.data.gun.GunData; @@ -13,54 +14,15 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; -import software.bernie.geckolib.cache.object.BakedGeoModel; import software.bernie.geckolib.cache.object.GeoBone; -import software.bernie.geckolib.renderer.GeoItemRenderer; -import java.util.HashSet; -import java.util.Set; - -public class VectorItemRenderer extends GeoItemRenderer { +public class VectorItemRenderer extends CustomGunRenderer { public VectorItemRenderer() { super(new VectorItemModel()); } - @Override - public RenderType getRenderType(VectorItem animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { - return RenderType.entityTranslucent(getTextureLocation(animatable)); - } - - private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; - protected boolean renderArms = false; - protected MultiBufferSource currentBuffer; - protected RenderType renderType; - public ItemDisplayContext transformType; - protected VectorItem 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, VectorItem 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, VectorItem animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, int color) { Minecraft mc = Minecraft.getInstance(); @@ -69,8 +31,6 @@ public class VectorItemRenderer extends GeoItemRenderer { if (name.equals("Lefthand") || name.equals("Righthand")) { bone.setHidden(true); renderingArms = true; - } else { - bone.setHidden(this.hiddenBones.contains(name)); } var player = mc.player; @@ -100,4 +60,9 @@ public class VectorItemRenderer extends GeoItemRenderer { } super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); } + + @Override + public ResourceLocation getTextureLocation(VectorItem instance) { + return super.getTextureLocation(instance); + } } 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 bee1feeca..c4218feb1 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 @@ -16,7 +16,10 @@ import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Style; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.entity.Entity; -import net.minecraft.world.item.*; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Rarity; +import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; import software.bernie.geckolib.animatable.GeoItem; import software.bernie.geckolib.animatable.instance.AnimatableInstanceCache; @@ -32,7 +35,6 @@ import java.util.function.Supplier; public class Trachelium extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); - public static ItemDisplayContext transformType; public Trachelium() { super(new Properties().stacksTo(1).rarity(Rarity.EPIC)); @@ -48,10 +50,6 @@ public class Trachelium extends GunItem implements GeoItem { return TracheliumItemRenderer::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/heavy/Ntw20Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/heavy/Ntw20Item.java index 7f53c378e..ae318da27 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 @@ -16,7 +16,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 software.bernie.geckolib.animatable.GeoItem; import software.bernie.geckolib.animatable.instance.AnimatableInstanceCache; @@ -30,7 +29,6 @@ import java.util.function.Supplier; public class Ntw20Item extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); - public static ItemDisplayContext transformType; public Ntw20Item() { super(new Properties().stacksTo(1).rarity(ModEnumExtensions.getLegendary())); @@ -46,10 +44,6 @@ public class Ntw20Item extends GunItem implements GeoItem { return Ntw20Renderer::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/RpgItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/RpgItem.java index 682764b49..e67877748 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 @@ -18,7 +18,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; @@ -38,25 +37,20 @@ import java.util.function.Supplier; public class RpgItem extends GunItem implements GeoItem { - @Override - public String getAmmoDisplayName(GunData data) { - return "Yassin105 TBG"; - } - private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); - public static ItemDisplayContext transformType; public RpgItem() { super(new Properties().stacksTo(1).rarity(Rarity.RARE)); } @Override - public Supplier> getRenderer() { - return RpgItemRenderer::new; + public String getAmmoDisplayName(GunData data) { + return "Yassin105 TBG"; } - public void getTransformType(ItemDisplayContext type) { - transformType = type; + @Override + public Supplier> getRenderer() { + return RpgItemRenderer::new; } private PlayState idlePredicate(AnimationState event) { 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 a1f268dd8..af53a993d 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 @@ -16,7 +16,6 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.entity.Entity; 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; @@ -33,7 +32,6 @@ import java.util.function.Supplier; public class RpkItem extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); - public static ItemDisplayContext transformType; public RpkItem() { super(new Properties().stacksTo(1).rarity(Rarity.EPIC)); @@ -44,10 +42,6 @@ public class RpkItem extends GunItem implements GeoItem { return RpkItemRenderer::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/Mk14Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Mk14Item.java index ffe73116f..f7344025f 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 @@ -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; @@ -32,7 +31,6 @@ import java.util.function.Supplier; public class Mk14Item extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); - public static ItemDisplayContext transformType; public Mk14Item() { super(new Properties().stacksTo(1).rarity(Rarity.EPIC)); @@ -43,10 +41,6 @@ public class Mk14Item extends GunItem implements GeoItem { return Mk14ItemRenderer::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/Qbz95Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Qbz95Item.java index c7ec6d22a..08b5ee7e0 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 @@ -16,7 +16,6 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.entity.Entity; 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; @@ -35,7 +34,6 @@ import java.util.function.Supplier; public class Qbz95Item extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); - public static ItemDisplayContext transformType; public Qbz95Item() { super(new Properties().stacksTo(1).rarity(Rarity.RARE)); @@ -46,10 +44,6 @@ public class Qbz95Item extends GunItem implements GeoItem { return Qbz95ItemRenderer::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/SksItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/SksItem.java index 537fc234a..230958889 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 @@ -12,7 +12,6 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.entity.Entity; 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; @@ -31,26 +30,21 @@ import java.util.function.Supplier; public class SksItem extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); - public static ItemDisplayContext transformType; + + public SksItem() { + super(new Item.Properties().stacksTo(1).rarity(Rarity.RARE)); + } @Override public Set getReloadSound() { return Set.of(ModSounds.SKS_RELOAD_EMPTY.get(), ModSounds.SKS_RELOAD_NORMAL.get()); } - public SksItem() { - super(new Properties().stacksTo(1).rarity(Rarity.RARE)); - } - @Override public Supplier> getRenderer() { return SksItemRenderer::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/smg/VectorItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/smg/VectorItem.java index 0c34c08f2..667982387 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 @@ -14,7 +14,6 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.entity.Entity; 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; @@ -31,17 +30,12 @@ import java.util.function.Supplier; public class VectorItem extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); - public static ItemDisplayContext transformType; public VectorItem() { super(new Properties().stacksTo(1).rarity(Rarity.EPIC)); } - 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/MosinNagantItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/MosinNagantItem.java index dc95514f9..f4f22a530 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 @@ -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 MosinNagantItem extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); - public static ItemDisplayContext transformType; public MosinNagantItem() { super(new Properties().stacksTo(1).rarity(Rarity.RARE)); @@ -37,10 +35,6 @@ public class MosinNagantItem extends GunItem implements GeoItem { return MosinNagantItemRenderer::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/SvdItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/SvdItem.java index 0e26117d7..3ba5e157b 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 @@ -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; @@ -32,7 +31,6 @@ import java.util.function.Supplier; public class SvdItem extends GunItem implements GeoItem { private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); - public static ItemDisplayContext transformType; public SvdItem() { super(new Properties().stacksTo(1).rarity(Rarity.EPIC)); @@ -43,10 +41,6 @@ public class SvdItem extends GunItem implements GeoItem { return SvdItemRenderer::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/special/TaserItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/special/TaserItem.java index 7f9a86fa0..d24ef8680 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 @@ -21,7 +21,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; @@ -43,7 +42,6 @@ public class TaserItem extends GunItem implements GeoItem, EnergyStorageItem { public static final int MAX_ENERGY = 6000; private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); - public static ItemDisplayContext transformType; public TaserItem() { super(new Properties().stacksTo(1).rarity(Rarity.COMMON)); @@ -76,10 +74,6 @@ public class TaserItem extends GunItem implements GeoItem, EnergyStorageItem { return TaserItemRenderer::new; } - public void getTransformType(ItemDisplayContext type) { - transformType = type; - } - private PlayState idlePredicate(AnimationState event) { LocalPlayer player = Minecraft.getInstance().player; if (player == null) return PlayState.STOP;