diff --git a/src/main/java/com/atsuishio/superbwarfare/client/AnimationHelper.java b/src/main/java/com/atsuishio/superbwarfare/client/AnimationHelper.java index 7304486a2..052c0b4fe 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/AnimationHelper.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/AnimationHelper.java @@ -21,9 +21,8 @@ public class AnimationHelper { public static void renderPartOverBone(ModelPart model, GeoBone bone, PoseStack stack, VertexConsumer buffer, int packedLightIn, int packedOverlayIn, float r, float g, float b, float a) { setupModelFromBone(model, bone); var color = FastColor.ARGB32.color((int) (a * 255), (int) (r * 255), (int) (g * 255), (int) (b * 255)); - - // TODO model.render ? -// model.render(stack, buffer, packedLightIn, packedOverlayIn, color); + // TODO model.render + // model.render(stack, buffer, packedLightIn, packedOverlayIn, color); } public static void setupModelFromBone(ModelPart model, GeoBone bone) { @@ -40,8 +39,9 @@ public class AnimationHelper { public static void renderPartOverBone2(ModelPart model, GeoBone bone, PoseStack stack, VertexConsumer buffer, int packedLightIn, int packedOverlayIn, float r, float g, float b, float a) { setupModelFromBone2(model, bone); var color = FastColor.ARGB32.color((int) (a * 255), (int) (r * 255), (int) (g * 255), (int) (b * 255)); + // TODO model.render -// model.render(stack, buffer, packedLightIn, packedOverlayIn, color); + // model.render(stack, buffer, packedLightIn, packedOverlayIn, color); } public static void setupModelFromBone2(ModelPart model, GeoBone bone) { diff --git a/src/main/java/com/atsuishio/superbwarfare/client/ItemModelHelper.java b/src/main/java/com/atsuishio/superbwarfare/client/ItemModelHelper.java index 88f8a5e03..0281cca5a 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/ItemModelHelper.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/ItemModelHelper.java @@ -8,17 +8,14 @@ import software.bernie.geckolib.cache.object.GeoBone; public class ItemModelHelper { public static void handleGunAttachments(GeoBone bone, ItemStack stack, String name) { + var rootTag = NBTTool.getTag(stack); + CompoundTag tag = rootTag.getCompound("Attachments"); - // TODO 正确隐藏渲染无关配件 - return; -// var rootTag = NBTTool.getTag(stack); -// CompoundTag tag = rootTag.getCompound("Attachments"); -// -// splitBoneName(bone, name, "Scope", tag); -// splitBoneName(bone, name, "Magazine", tag); -// splitBoneName(bone, name, "Barrel", tag); -// splitBoneName(bone, name, "Stock", tag); -// splitBoneName(bone, name, "Grip", tag); + splitBoneName(bone, name, "Scope", tag); + splitBoneName(bone, name, "Magazine", tag); + splitBoneName(bone, name, "Barrel", tag); + splitBoneName(bone, name, "Stock", tag); + splitBoneName(bone, name, "Grip", tag); } private static void splitBoneName(GeoBone bone, String boneName, String tagName, CompoundTag tag) { diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/VectorLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/VectorLayer.java index 37e0dd144..5f25d6b1e 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/VectorLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/VectorLayer.java @@ -22,6 +22,6 @@ public class VectorLayer extends GeoRenderLayer { @Override public void render(PoseStack poseStack, VectorItem animatable, BakedGeoModel bakedModel, RenderType renderType, MultiBufferSource bufferSource, VertexConsumer buffer, float partialTick, int packedLight, int packedOverlay) { RenderType glowRenderType = RenderType.eyes(LAYER); - getRenderer().reRender(getDefaultBakedModel(animatable), poseStack, bufferSource, animatable, glowRenderType, bufferSource.getBuffer(glowRenderType), partialTick, packedLight, OverlayTexture.NO_OVERLAY, 0xFFFFFFFF); + getRenderer().reRender(getDefaultBakedModel(animatable), poseStack, bufferSource, animatable, glowRenderType, bufferSource.getBuffer(glowRenderType), partialTick, packedLight, OverlayTexture.NO_OVERLAY, -1); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/AK12ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/AK12ItemRenderer.java index 98903ccc3..4a948e1cd 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/AK12ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/AK12ItemRenderer.java @@ -2,7 +2,6 @@ package com.atsuishio.superbwarfare.client.renderer.item; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.ItemModelHelper; -import com.atsuishio.superbwarfare.client.layer.gun.AK12Layer; import com.atsuishio.superbwarfare.client.model.item.AK12ItemModel; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; @@ -34,7 +33,8 @@ public class AK12ItemRenderer extends GeoItemRenderer { public AK12ItemRenderer() { super(new AK12ItemModel()); - this.addRenderLayer(new AK12Layer(this)); + // TODO layer +// this.addRenderLayer(new AK12Layer(this)); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/AK47ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/AK47ItemRenderer.java index d1b1bdcbb..1ef4d71a6 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/AK47ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/AK47ItemRenderer.java @@ -2,7 +2,6 @@ package com.atsuishio.superbwarfare.client.renderer.item; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.ItemModelHelper; -import com.atsuishio.superbwarfare.client.layer.gun.AK47Layer; import com.atsuishio.superbwarfare.client.model.item.AK47ItemModel; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; @@ -34,7 +33,8 @@ public class AK47ItemRenderer extends GeoItemRenderer { public AK47ItemRenderer() { super(new AK47ItemModel()); - this.addRenderLayer(new AK47Layer(this)); + // TODO layer +// this.addRenderLayer(new AK47Layer(this)); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Aa12ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Aa12ItemRenderer.java index ee1d862b1..0e32ebd2e 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Aa12ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Aa12ItemRenderer.java @@ -2,7 +2,6 @@ package com.atsuishio.superbwarfare.client.renderer.item; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.ItemModelHelper; -import com.atsuishio.superbwarfare.client.layer.gun.Aa12Layer; import com.atsuishio.superbwarfare.client.model.item.Aa12ItemModel; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; @@ -33,7 +32,8 @@ public class Aa12ItemRenderer extends GeoItemRenderer { public Aa12ItemRenderer() { super(new Aa12ItemModel()); - this.addRenderLayer(new Aa12Layer(this)); + // TODO layer +// this.addRenderLayer(new Aa12Layer(this)); } @Override 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 747259478..ece6442c4 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 @@ -1,7 +1,6 @@ package com.atsuishio.superbwarfare.client.renderer.item; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.layer.gun.BocekLayer; import com.atsuishio.superbwarfare.client.model.item.BocekItemModel; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; @@ -18,7 +17,6 @@ import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.entity.player.PlayerRenderer; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import software.bernie.geckolib.cache.object.BakedGeoModel; @@ -33,7 +31,8 @@ public class BocekItemRenderer extends GeoItemRenderer { public BocekItemRenderer() { super(new BocekItemModel()); - this.addRenderLayer(new BocekLayer(this)); + // TODO layer +// this.addRenderLayer(new BocekLayer(this)); } @Override @@ -81,9 +80,8 @@ public class BocekItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - Player player = mc.player; + var player = mc.player; if (player == null) return; - ItemStack itemStack = player.getMainHandItem(); if (!itemStack.is(ModTags.Items.GUN)) return; @@ -110,6 +108,7 @@ public class BocekItemRenderer extends GeoItemRenderer { PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); PlayerModel model = playerRenderer.getModel(); stack.pushPose(); + RenderUtil.translateMatrixToBone(stack, bone); RenderUtil.translateToPivotPoint(stack, bone); RenderUtil.rotateMatrixAroundBone(stack, bone); @@ -131,8 +130,7 @@ public class BocekItemRenderer extends GeoItemRenderer { this.currentBuffer.getBuffer(this.renderType); stack.popPose(); } - // TODO bocek renderer -// super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); + super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/DevotionItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/DevotionItemRenderer.java index 53f3e6eb8..7b128ea9b 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/DevotionItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/DevotionItemRenderer.java @@ -1,7 +1,6 @@ package com.atsuishio.superbwarfare.client.renderer.item; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.layer.gun.DevotionLayer; import com.atsuishio.superbwarfare.client.model.item.DevotionItemModel; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; @@ -32,7 +31,8 @@ public class DevotionItemRenderer extends GeoItemRenderer { public DevotionItemRenderer() { super(new DevotionItemModel()); - this.addRenderLayer(new DevotionLayer(this)); + // TODO layer +// this.addRenderLayer(new DevotionLayer(this)); } @Override 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 f5efc9add..25a3d8ec3 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 @@ -1,8 +1,6 @@ package com.atsuishio.superbwarfare.client.renderer.item; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.layer.gun.Glock17Layer; -import com.atsuishio.superbwarfare.client.layer.gun.Glock17LightLayer; import com.atsuishio.superbwarfare.client.model.item.Glock17ItemModel; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; @@ -32,8 +30,10 @@ public class Glock17ItemRenderer extends GeoItemRenderer { public Glock17ItemRenderer() { super(new Glock17ItemModel()); - this.addRenderLayer(new Glock17Layer(this)); - this.addRenderLayer(new Glock17LightLayer(this)); + // TODO layer +// this.addRenderLayer(new Glock17Layer(this)); + // TODO layer +// this.addRenderLayer(new Glock17LightLayer(this)); } @Override 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 16cb64fdd..cefbbac5a 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 @@ -1,8 +1,6 @@ package com.atsuishio.superbwarfare.client.renderer.item; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.layer.gun.Glock18Layer; -import com.atsuishio.superbwarfare.client.layer.gun.Glock18LightLayer; import com.atsuishio.superbwarfare.client.model.item.Glock18ItemModel; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; @@ -32,8 +30,10 @@ public class Glock18ItemRenderer extends GeoItemRenderer { public Glock18ItemRenderer() { super(new Glock18ItemModel()); - this.addRenderLayer(new Glock18Layer(this)); - this.addRenderLayer(new Glock18LightLayer(this)); + // TODO layer +// this.addRenderLayer(new Glock18Layer(this)); + // TODO layer +// this.addRenderLayer(new Glock18LightLayer(this)); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Hk416ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Hk416ItemRenderer.java index d451d5e4b..6dc0ecc7a 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Hk416ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Hk416ItemRenderer.java @@ -2,7 +2,6 @@ package com.atsuishio.superbwarfare.client.renderer.item; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.ItemModelHelper; -import com.atsuishio.superbwarfare.client.layer.gun.Hk416Layer; import com.atsuishio.superbwarfare.client.model.item.Hk416ItemModel; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; @@ -34,7 +33,8 @@ public class Hk416ItemRenderer extends GeoItemRenderer { public Hk416ItemRenderer() { super(new Hk416ItemModel()); - this.addRenderLayer(new Hk416Layer(this)); + // TODO layer +// this.addRenderLayer(new Hk416Layer(this)); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/HomemadeShotgunItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/HomemadeShotgunItemRenderer.java index 0a091e6e7..aea93f1c9 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/HomemadeShotgunItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/HomemadeShotgunItemRenderer.java @@ -1,7 +1,6 @@ package com.atsuishio.superbwarfare.client.renderer.item; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.layer.gun.HomemadeShotgunLayer; import com.atsuishio.superbwarfare.client.model.item.HomemadeShotgunItemModel; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; @@ -31,7 +30,8 @@ public class HomemadeShotgunItemRenderer extends GeoItemRenderer public HuntingRifleItemRenderer() { super(new HuntingRifleItemModel()); - this.addRenderLayer(new HuntingRifleLayer(this)); + // TODO layer +// this.addRenderLayer(new HuntingRifleLayer(this)); } @Override 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 aeb44508d..69257424c 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 @@ -1,7 +1,6 @@ package com.atsuishio.superbwarfare.client.renderer.item; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.layer.gun.K98Layer; import com.atsuishio.superbwarfare.client.model.item.K98ItemModel; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; @@ -31,7 +30,8 @@ public class K98ItemRenderer extends GeoItemRenderer { public K98ItemRenderer() { super(new K98ItemModel()); - this.addRenderLayer(new K98Layer(this)); + // TODO layer +// this.addRenderLayer(new K98Layer(this)); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M1911ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M1911ItemRenderer.java index 37c0298d6..c2a7ee5d2 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M1911ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M1911ItemRenderer.java @@ -1,7 +1,6 @@ package com.atsuishio.superbwarfare.client.renderer.item; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.layer.gun.M1911Layer; import com.atsuishio.superbwarfare.client.model.item.M1911ItemModel; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; @@ -31,7 +30,8 @@ public class M1911ItemRenderer extends GeoItemRenderer { public M1911ItemRenderer() { super(new M1911ItemModel()); - this.addRenderLayer(new M1911Layer(this)); + // TODO layer +// this.addRenderLayer(new M1911Layer(this)); } @Override 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 9f4e048a7..c5bdc0f62 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 @@ -2,7 +2,6 @@ package com.atsuishio.superbwarfare.client.renderer.item; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.ItemModelHelper; -import com.atsuishio.superbwarfare.client.layer.gun.M4Layer; import com.atsuishio.superbwarfare.client.model.item.M4ItemModel; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; @@ -34,7 +33,8 @@ public class M4ItemRenderer extends GeoItemRenderer { public M4ItemRenderer() { super(new M4ItemModel()); - this.addRenderLayer(new M4Layer(this)); + // TODO layer +// this.addRenderLayer(new M4Layer(this)); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M60ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M60ItemRenderer.java index 18203c849..b8305dd37 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M60ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M60ItemRenderer.java @@ -1,7 +1,6 @@ package com.atsuishio.superbwarfare.client.renderer.item; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.layer.gun.M60Layer; import com.atsuishio.superbwarfare.client.model.item.M60ItemModel; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; @@ -31,7 +30,8 @@ public class M60ItemRenderer extends GeoItemRenderer { public M60ItemRenderer() { super(new M60ItemModel()); - this.addRenderLayer(new M60Layer(this)); + // TODO layer +// this.addRenderLayer(new M60Layer(this)); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M79ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M79ItemRenderer.java index 0bdbd89f2..cc8ee4b61 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M79ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M79ItemRenderer.java @@ -1,7 +1,6 @@ package com.atsuishio.superbwarfare.client.renderer.item; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.layer.gun.M79Layer; import com.atsuishio.superbwarfare.client.model.item.M79ItemModel; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; @@ -31,7 +30,8 @@ public class M79ItemRenderer extends GeoItemRenderer { public M79ItemRenderer() { super(new M79ItemModel()); - this.addRenderLayer(new M79Layer(this)); + // TODO layer +// this.addRenderLayer(new M79Layer(this)); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M870ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M870ItemRenderer.java index e21bf5642..9d210d56f 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M870ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M870ItemRenderer.java @@ -1,7 +1,6 @@ package com.atsuishio.superbwarfare.client.renderer.item; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.layer.gun.M870Layer; import com.atsuishio.superbwarfare.client.model.item.M870ItemModel; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; @@ -31,7 +30,8 @@ public class M870ItemRenderer extends GeoItemRenderer { public M870ItemRenderer() { super(new M870ItemModel()); - this.addRenderLayer(new M870Layer(this)); + // TODO layer +// this.addRenderLayer(new M870Layer(this)); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M98bItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M98bItemRenderer.java index 2bbb8cb57..8b0813772 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M98bItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M98bItemRenderer.java @@ -1,7 +1,6 @@ package com.atsuishio.superbwarfare.client.renderer.item; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.layer.gun.M98bLayer; import com.atsuishio.superbwarfare.client.model.item.M98bItemModel; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; @@ -32,7 +31,8 @@ public class M98bItemRenderer extends GeoItemRenderer { public M98bItemRenderer() { super(new M98bItemModel()); - this.addRenderLayer(new M98bLayer(this)); + // TODO layer +// this.addRenderLayer(new M98bLayer(this)); } @Override 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 91f81852b..95cf95148 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 @@ -1,7 +1,6 @@ package com.atsuishio.superbwarfare.client.renderer.item; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.layer.gun.MarlinLayer; import com.atsuishio.superbwarfare.client.model.item.MarlinItemModel; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; @@ -31,7 +30,8 @@ public class MarlinItemRenderer extends GeoItemRenderer { public MarlinItemRenderer() { super(new MarlinItemModel()); - this.addRenderLayer(new MarlinLayer(this)); + // TODO layer +// this.addRenderLayer(new MarlinLayer(this)); } @Override 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 0306d8c61..1d7070227 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 @@ -1,8 +1,6 @@ package com.atsuishio.superbwarfare.client.renderer.item; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.layer.gun.MinigunHeatLayer; -import com.atsuishio.superbwarfare.client.layer.gun.MinigunLayer; import com.atsuishio.superbwarfare.client.model.item.MinigunItemModel; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; @@ -32,8 +30,10 @@ public class MinigunItemRenderer extends GeoItemRenderer { public MinigunItemRenderer() { super(new MinigunItemModel()); - this.addRenderLayer(new MinigunLayer(this)); - this.addRenderLayer(new MinigunHeatLayer(this)); + // TODO layer +// this.addRenderLayer(new MinigunLayer(this)); + // TODO layer +// this.addRenderLayer(new MinigunHeatLayer(this)); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Mk14ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Mk14ItemRenderer.java index 5da4ae2b4..718f5cce5 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Mk14ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Mk14ItemRenderer.java @@ -2,7 +2,6 @@ package com.atsuishio.superbwarfare.client.renderer.item; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.ItemModelHelper; -import com.atsuishio.superbwarfare.client.layer.gun.Mk14Layer; import com.atsuishio.superbwarfare.client.model.item.Mk14ItemModel; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; @@ -34,7 +33,8 @@ public class Mk14ItemRenderer extends GeoItemRenderer { public Mk14ItemRenderer() { super(new Mk14ItemModel()); - this.addRenderLayer(new Mk14Layer(this)); + // TODO layer +// this.addRenderLayer(new Mk14Layer(this)); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/MosinNagantItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/MosinNagantItemRenderer.java index d40bc4e2c..ceba03ee4 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/MosinNagantItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/MosinNagantItemRenderer.java @@ -1,7 +1,6 @@ package com.atsuishio.superbwarfare.client.renderer.item; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.layer.gun.MosinNagantLayer; import com.atsuishio.superbwarfare.client.model.item.MosinNagantItemModel; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; @@ -32,7 +31,8 @@ public class MosinNagantItemRenderer extends GeoItemRenderer { public MosinNagantItemRenderer() { super(new MosinNagantItemModel()); - this.addRenderLayer(new MosinNagantLayer(this)); + // TODO layer +// this.addRenderLayer(new MosinNagantLayer(this)); } @Override 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 638370ce0..b869567b4 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 @@ -1,8 +1,6 @@ package com.atsuishio.superbwarfare.client.renderer.item; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.layer.gun.Mp443Layer; -import com.atsuishio.superbwarfare.client.layer.gun.Mp443LightLayer; import com.atsuishio.superbwarfare.client.model.item.Mp443ItemModel; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; @@ -32,8 +30,10 @@ public class Mp443ItemRenderer extends GeoItemRenderer { public Mp443ItemRenderer() { super(new Mp443ItemModel()); - this.addRenderLayer(new Mp443Layer(this)); - this.addRenderLayer(new Mp443LightLayer(this)); + // TODO layer +// this.addRenderLayer(new Mp443Layer(this)); + // TODO layer +// this.addRenderLayer(new Mp443LightLayer(this)); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Ntw20Renderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Ntw20Renderer.java index 4c3c3def9..7e8212a12 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Ntw20Renderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Ntw20Renderer.java @@ -2,7 +2,6 @@ package com.atsuishio.superbwarfare.client.renderer.item; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.ItemModelHelper; -import com.atsuishio.superbwarfare.client.layer.gun.Ntw20Layer; import com.atsuishio.superbwarfare.client.model.item.Ntw20Model; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; @@ -34,7 +33,8 @@ public class Ntw20Renderer extends GeoItemRenderer { public Ntw20Renderer() { super(new Ntw20Model()); - this.addRenderLayer(new Ntw20Layer(this)); + // TODO layer +// this.addRenderLayer(new Ntw20Layer(this)); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Qbz95ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Qbz95ItemRenderer.java index 01a6d4fba..26254fea9 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Qbz95ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Qbz95ItemRenderer.java @@ -2,7 +2,6 @@ package com.atsuishio.superbwarfare.client.renderer.item; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.ItemModelHelper; -import com.atsuishio.superbwarfare.client.layer.gun.Qbz95Layer; import com.atsuishio.superbwarfare.client.model.item.Qbz95ItemModel; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; @@ -34,7 +33,8 @@ public class Qbz95ItemRenderer extends GeoItemRenderer { public Qbz95ItemRenderer() { super(new Qbz95ItemModel()); - this.addRenderLayer(new Qbz95Layer(this)); + // TODO layer +// this.addRenderLayer(new Qbz95Layer(this)); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/RpkItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/RpkItemRenderer.java index a7d03a32c..d9cd04645 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/RpkItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/RpkItemRenderer.java @@ -1,7 +1,6 @@ package com.atsuishio.superbwarfare.client.renderer.item; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.layer.gun.RpkLayer; import com.atsuishio.superbwarfare.client.model.item.RpkItemModel; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; @@ -32,7 +31,8 @@ public class RpkItemRenderer extends GeoItemRenderer { public RpkItemRenderer() { super(new RpkItemModel()); - this.addRenderLayer(new RpkLayer(this)); + // TODO layer +// this.addRenderLayer(new RpkLayer(this)); } @Override 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 b6dbbeb2a..52bed63bf 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 @@ -1,7 +1,6 @@ package com.atsuishio.superbwarfare.client.renderer.item; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.layer.gun.SecondaryCataclysmLightLayer; import com.atsuishio.superbwarfare.client.model.item.SecondaryCataclysmModel; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; @@ -31,7 +30,8 @@ public class SecondaryCataclysmRenderer extends GeoItemRenderer { public SentinelItemRenderer() { super(new SentinelItemModel()); - this.addRenderLayer(new SentinelLayer(this)); - this.addRenderLayer(new SentinelLightLayer(this)); + // TODO layer +// this.addRenderLayer(new SentinelLayer(this)); + // TODO layer +// this.addRenderLayer(new SentinelLightLayer(this)); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/SksItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/SksItemRenderer.java index b6a7dea0f..f30df536e 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/SksItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/SksItemRenderer.java @@ -1,7 +1,6 @@ package com.atsuishio.superbwarfare.client.renderer.item; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.layer.gun.SksLayer; import com.atsuishio.superbwarfare.client.model.item.SksItemModel; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; @@ -32,7 +31,8 @@ public class SksItemRenderer extends GeoItemRenderer { public SksItemRenderer() { super(new SksItemModel()); - this.addRenderLayer(new SksLayer(this)); + // TODO layer +// this.addRenderLayer(new SksLayer(this)); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/SvdItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/SvdItemRenderer.java index 145b71995..7dd0732eb 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/SvdItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/SvdItemRenderer.java @@ -2,7 +2,6 @@ package com.atsuishio.superbwarfare.client.renderer.item; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.ItemModelHelper; -import com.atsuishio.superbwarfare.client.layer.gun.SvdLayer; import com.atsuishio.superbwarfare.client.model.item.SvdItemModel; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; @@ -34,7 +33,8 @@ public class SvdItemRenderer extends GeoItemRenderer { public SvdItemRenderer() { super(new SvdItemModel()); - this.addRenderLayer(new SvdLayer(this)); + // TODO layer +// this.addRenderLayer(new SvdLayer(this)); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/TracheliumItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/TracheliumItemRenderer.java index ebe45229f..e4a6b86d8 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/TracheliumItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/TracheliumItemRenderer.java @@ -2,8 +2,6 @@ package com.atsuishio.superbwarfare.client.renderer.item; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.ItemModelHelper; -import com.atsuishio.superbwarfare.client.layer.gun.TracheliumLayer; -import com.atsuishio.superbwarfare.client.layer.gun.TracheliumLightLayer; import com.atsuishio.superbwarfare.client.model.item.TracheliumItemModel; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; @@ -35,8 +33,10 @@ public class TracheliumItemRenderer extends GeoItemRenderer { public TracheliumItemRenderer() { super(new TracheliumItemModel()); - this.addRenderLayer(new TracheliumLayer(this)); - this.addRenderLayer(new TracheliumLightLayer(this)); + // TODO layer +// this.addRenderLayer(new TracheliumLayer(this)); + // TODO layer +// this.addRenderLayer(new TracheliumLightLayer(this)); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/VectorItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/VectorItemRenderer.java index 5bf6561fc..834834095 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/VectorItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/VectorItemRenderer.java @@ -37,15 +37,17 @@ public class VectorItemRenderer extends GeoItemRenderer { public ItemDisplayContext transformType; protected VectorItem animatable; private final Set hiddenBones; - private final Set suppressedBones; public VectorItemRenderer() { super(new VectorItemModel()); + // TODO layer + +// // TODO layer +// this.addRenderLayer(new VectorLayer(this)); + this.renderArms = false; this.hiddenBones = new HashSet<>(); - this.suppressedBones = new HashSet<>(); - } public RenderType getRenderType(VectorItem animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { @@ -117,6 +119,7 @@ public class VectorItemRenderer extends GeoItemRenderer { ItemModelHelper.handleGunAttachments(bone, itemStack, name); + if (this.transformType.firstPerson() && renderingArms) { AbstractClientPlayer localPlayer = mc.player;