diff --git a/src/main/java/com/atsuishio/superbwarfare/client/AnimationHelper.java b/src/main/java/com/atsuishio/superbwarfare/client/AnimationHelper.java index 263b701eb..bd7e111e0 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/AnimationHelper.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/AnimationHelper.java @@ -1,6 +1,7 @@ package com.atsuishio.superbwarfare.client; import com.atsuishio.superbwarfare.Mod; +import com.atsuishio.superbwarfare.client.renderer.ModRenderTypes; import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.data.gun.value.AttachmentType; import com.atsuishio.superbwarfare.event.ClientEventHandler; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/CustomRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/CustomGunRenderer.java similarity index 92% rename from src/main/java/com/atsuishio/superbwarfare/client/CustomRenderer.java rename to src/main/java/com/atsuishio/superbwarfare/client/CustomGunRenderer.java index 2d817cb15..36eb73068 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/CustomRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/CustomGunRenderer.java @@ -1,10 +1,12 @@ package com.atsuishio.superbwarfare.client; +import com.atsuishio.superbwarfare.client.renderer.ModRenderTypes; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.texture.OverlayTexture; +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; @@ -18,7 +20,9 @@ import software.bernie.geckolib.renderer.GeoItemRenderer; import software.bernie.geckolib.util.Color; import software.bernie.geckolib.util.RenderUtil; -public class CustomRenderer extends GeoItemRenderer { +public class CustomGunRenderer extends GeoItemRenderer { + + public static final float SCALE_RECIPROCAL = 1.0f / 16.0f; protected T animatable; protected boolean renderArms = false; @@ -26,7 +30,7 @@ public class CustomRenderer extends GeoItemRende protected RenderType renderType; public ItemDisplayContext transformType; - public CustomRenderer(GeoModel model) { + public CustomGunRenderer(GeoModel model) { super(model); } @@ -48,6 +52,11 @@ public class CustomRenderer extends GeoItemRende } } + @Override + public RenderType getRenderType(T animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { + return RenderType.entityTranslucent(getTextureLocation(animatable)); + } + @Override public void defaultRender(PoseStack poseStack, T animatable, MultiBufferSource bufferSource, @Nullable RenderType renderType, @Nullable VertexConsumer buffer, float yaw, float partialTick, int packedLight) { poseStack.pushPose(); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/AnnihilatorGlowLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/AnnihilatorGlowLayer.java index 0e14e0fa8..3862c178e 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/AnnihilatorGlowLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/AnnihilatorGlowLayer.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.client.layer.vehicle; import com.atsuishio.superbwarfare.Mod; -import com.atsuishio.superbwarfare.client.ModRenderTypes; +import com.atsuishio.superbwarfare.client.renderer.ModRenderTypes; import com.atsuishio.superbwarfare.entity.vehicle.AnnihilatorEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/Hpj11Layer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/Hpj11Layer.java index 312a0de0a..6401ecf4e 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/Hpj11Layer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/Hpj11Layer.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.client.layer.vehicle; import com.atsuishio.superbwarfare.Mod; -import com.atsuishio.superbwarfare.client.ModRenderTypes; +import com.atsuishio.superbwarfare.client.renderer.ModRenderTypes; import com.atsuishio.superbwarfare.entity.vehicle.Hpj11Entity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/Yx100GlowLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/Yx100GlowLayer.java index bdea6317a..57396b91c 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/Yx100GlowLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/Yx100GlowLayer.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.client.layer.vehicle; import com.atsuishio.superbwarfare.Mod; -import com.atsuishio.superbwarfare.client.ModRenderTypes; +import com.atsuishio.superbwarfare.client.renderer.ModRenderTypes; import com.atsuishio.superbwarfare.entity.vehicle.Yx100Entity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/CustomRenderType.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/CustomRenderType.java deleted file mode 100644 index e352d3e62..000000000 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/CustomRenderType.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.atsuishio.superbwarfare.client.renderer; - -import com.mojang.blaze3d.vertex.DefaultVertexFormat; -import com.mojang.blaze3d.vertex.VertexFormat; -import net.minecraft.client.renderer.RenderType; - -public class CustomRenderType extends RenderType { - public CustomRenderType(String pName, VertexFormat pFormat, VertexFormat.Mode pMode, int pBufferSize, boolean pAffectsCrumbling, boolean pSortOnUpload, Runnable pSetupState, Runnable pClearState) { - super(pName, pFormat, pMode, pBufferSize, pAffectsCrumbling, pSortOnUpload, pSetupState, pClearState); - } - - public static final RenderType BLOCK_OVERLAY = create("block_overlay", - DefaultVertexFormat.POSITION_COLOR, VertexFormat.Mode.QUADS, 256, false, false, - CompositeState.builder() - .setShaderState(ShaderStateShard.POSITION_COLOR_SHADER) - .setLayeringState(NO_LAYERING) - .setTransparencyState(TRANSLUCENT_TRANSPARENCY) - .setTextureState(NO_TEXTURE) - .setDepthTestState(LEQUAL_DEPTH_TEST) - .setCullState(NO_CULL) - .setLightmapState(NO_LIGHTMAP) - .setWriteMaskState(COLOR_WRITE) - .createCompositeState(false)); -} diff --git a/src/main/java/com/atsuishio/superbwarfare/client/ModRenderTypes.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/ModRenderTypes.java similarity index 82% rename from src/main/java/com/atsuishio/superbwarfare/client/ModRenderTypes.java rename to src/main/java/com/atsuishio/superbwarfare/client/renderer/ModRenderTypes.java index 779df545e..cc6728645 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/ModRenderTypes.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/ModRenderTypes.java @@ -1,4 +1,4 @@ -package com.atsuishio.superbwarfare.client; +package com.atsuishio.superbwarfare.client.renderer; import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; @@ -35,8 +35,7 @@ public class ModRenderTypes extends RenderType { return RenderType.create("illuminated", DefaultVertexFormat.NEW_ENTITY, VertexFormat.Mode.QUADS, 256, true, false, state); }); - //DickSheep的恩情还不完 - + // DickSheep的恩情还不完 public static final TransparencyStateShard TEST_TRANSPARENCY = new TransparencyStateShard("test_transparency", () -> { RenderSystem.enableBlend(); RenderSystem.blendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ONE); @@ -62,4 +61,17 @@ public class ModRenderTypes extends RenderType { .createCompositeState(false); return RenderType.create("muzzle_flash", DefaultVertexFormat.POSITION_TEX_COLOR, VertexFormat.Mode.QUADS, 256, false, true, state); }); + + public static final RenderType BLOCK_OVERLAY = create("block_overlay", + DefaultVertexFormat.POSITION_COLOR, VertexFormat.Mode.QUADS, 256, false, false, + CompositeState.builder() + .setShaderState(ShaderStateShard.POSITION_COLOR_SHADER) + .setLayeringState(NO_LAYERING) + .setTransparencyState(TRANSLUCENT_TRANSPARENCY) + .setTextureState(NO_TEXTURE) + .setDepthTestState(LEQUAL_DEPTH_TEST) + .setCullState(NO_CULL) + .setLightmapState(NO_LIGHTMAP) + .setWriteMaskState(COLOR_WRITE) + .createCompositeState(false)); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/block/ChargingStationBlockEntityRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/block/ChargingStationBlockEntityRenderer.java index bb0697c93..b6b89dfe7 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/block/ChargingStationBlockEntityRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/block/ChargingStationBlockEntityRenderer.java @@ -2,7 +2,7 @@ package com.atsuishio.superbwarfare.client.renderer.block; import com.atsuishio.superbwarfare.block.ChargingStationBlock; import com.atsuishio.superbwarfare.block.entity.ChargingStationBlockEntity; -import com.atsuishio.superbwarfare.client.renderer.CustomRenderType; +import com.atsuishio.superbwarfare.client.renderer.ModRenderTypes; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.blockentity.BlockEntityRenderer; @@ -40,7 +40,7 @@ public class ChargingStationBlockEntityRenderer implements BlockEntityRenderer { +public class BocekItemRenderer extends CustomGunRenderer { public BocekItemRenderer() { super(new BocekItemModel()); } - @Override - public RenderType getRenderType(BocekItem animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { - return RenderType.entityTranslucent(getTextureLocation(animatable)); - } - - private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; - @Override public void illuminatedRender(PoseStack poseStack, BocekItem animatable, GeoBone bone, RenderType renderType, MultiBufferSource bufferSource, VertexConsumer buffer, float partialTick, int packedLight, int packedOverlay, int color) { @@ -94,10 +86,4 @@ public class BocekItemRenderer extends CustomRenderer { } super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); } - - - @Override - public ResourceLocation getTextureLocation(BocekItem instance) { - return super.getTextureLocation(instance); - } } 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 9361324e4..db05a1a8b 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,7 +1,7 @@ package com.atsuishio.superbwarfare.client.renderer.item; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.CustomRenderer; +import com.atsuishio.superbwarfare.client.CustomGunRenderer; import com.atsuishio.superbwarfare.client.model.item.Glock17ItemModel; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.item.gun.handgun.Glock17Item; @@ -10,23 +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.ItemStack; import software.bernie.geckolib.cache.object.GeoBone; -public class Glock17ItemRenderer extends CustomRenderer { +public class Glock17ItemRenderer extends CustomGunRenderer { public Glock17ItemRenderer() { super(new Glock17ItemModel()); } - @Override - public RenderType getRenderType(Glock17Item animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { - return RenderType.entityTranslucent(getTextureLocation(animatable)); - } - - private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; - @Override public void renderRecursively(PoseStack stack, Glock17Item animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, int color) { Minecraft mc = Minecraft.getInstance(); @@ -49,9 +41,4 @@ public class Glock17ItemRenderer extends CustomRenderer { } super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); } - - @Override - public ResourceLocation getTextureLocation(Glock17Item instance) { - return super.getTextureLocation(instance); - } } 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 849f4ad2f..7c8350689 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,7 +1,7 @@ package com.atsuishio.superbwarfare.client.renderer.item; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.CustomRenderer; +import com.atsuishio.superbwarfare.client.CustomGunRenderer; import com.atsuishio.superbwarfare.client.model.item.Glock18ItemModel; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.item.gun.handgun.Glock18Item; @@ -10,23 +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.ItemStack; import software.bernie.geckolib.cache.object.GeoBone; -public class Glock18ItemRenderer extends CustomRenderer { +public class Glock18ItemRenderer extends CustomGunRenderer { public Glock18ItemRenderer() { super(new Glock18ItemModel()); } - @Override - public RenderType getRenderType(Glock18Item animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { - return RenderType.entityTranslucent(getTextureLocation(animatable)); - } - - private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; - @Override public void renderRecursively(PoseStack stack, Glock18Item animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, int color) { Minecraft mc = Minecraft.getInstance(); @@ -49,9 +41,4 @@ public class Glock18ItemRenderer extends CustomRenderer { } super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); } - - @Override - public ResourceLocation getTextureLocation(Glock18Item instance) { - return super.getTextureLocation(instance); - } } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/HuntingRifleItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/HuntingRifleItemRenderer.java index c6e6877cb..8b79fa356 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/HuntingRifleItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/HuntingRifleItemRenderer.java @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.client.renderer.item; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.CustomRenderer; +import com.atsuishio.superbwarfare.client.CustomGunRenderer; import com.atsuishio.superbwarfare.client.model.item.HuntingRifleItemModel; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.item.gun.sniper.HuntingRifleItem; @@ -10,23 +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.ItemStack; import software.bernie.geckolib.cache.object.GeoBone; -public class HuntingRifleItemRenderer extends CustomRenderer { +public class HuntingRifleItemRenderer extends CustomGunRenderer { public HuntingRifleItemRenderer() { super(new HuntingRifleItemModel()); } - @Override - public RenderType getRenderType(HuntingRifleItem animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { - return RenderType.entityTranslucent(getTextureLocation(animatable)); - } - - private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; - @Override public void renderRecursively(PoseStack stack, HuntingRifleItem animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, int color) { Minecraft mc = Minecraft.getInstance(); @@ -49,10 +41,5 @@ public class HuntingRifleItemRenderer extends CustomRenderer { } super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); } - - @Override - public ResourceLocation getTextureLocation(HuntingRifleItem instance) { - return super.getTextureLocation(instance); - } } 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 68bd03a37..13154526b 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,7 @@ package com.atsuishio.superbwarfare.client.renderer.item; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.CustomRenderer; +import com.atsuishio.superbwarfare.client.CustomGunRenderer; import com.atsuishio.superbwarfare.client.model.item.K98ItemModel; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.item.gun.sniper.K98Item; @@ -10,23 +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.ItemStack; import software.bernie.geckolib.cache.object.GeoBone; -public class K98ItemRenderer extends CustomRenderer { +public class K98ItemRenderer extends CustomGunRenderer { public K98ItemRenderer() { super(new K98ItemModel()); } - @Override - public RenderType getRenderType(K98Item animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { - return RenderType.entityTranslucent(getTextureLocation(animatable)); - } - - private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; - @Override public void renderRecursively(PoseStack stack, K98Item animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, int color) { Minecraft mc = Minecraft.getInstance(); @@ -49,9 +41,4 @@ public class K98ItemRenderer extends CustomRenderer { } super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); } - - @Override - public ResourceLocation getTextureLocation(K98Item instance) { - return super.getTextureLocation(instance); - } } 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 cb27c5a5f..e3312f98c 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 @@ -1,7 +1,7 @@ package com.atsuishio.superbwarfare.client.renderer.item; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.CustomRenderer; +import com.atsuishio.superbwarfare.client.CustomGunRenderer; import com.atsuishio.superbwarfare.client.ItemModelHelper; import com.atsuishio.superbwarfare.client.model.item.M4ItemModel; import com.atsuishio.superbwarfare.data.gun.GunData; @@ -15,23 +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.ItemStack; import software.bernie.geckolib.cache.object.GeoBone; -public class M4ItemRenderer extends CustomRenderer { +public class M4ItemRenderer extends CustomGunRenderer { public M4ItemRenderer() { super(new M4ItemModel()); } - @Override - public RenderType getRenderType(M4Item animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { - return RenderType.entityTranslucent(getTextureLocation(animatable)); - } - - private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; - @Override public void renderRecursively(PoseStack stack, M4Item animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, int color) { Minecraft mc = Minecraft.getInstance(); @@ -85,9 +77,4 @@ public class M4ItemRenderer extends CustomRenderer { } super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); } - - @Override - public ResourceLocation getTextureLocation(M4Item instance) { - return super.getTextureLocation(instance); - } } 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 f64cf736f..20dd7d627 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,7 @@ package com.atsuishio.superbwarfare.client.renderer.item; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.CustomRenderer; +import com.atsuishio.superbwarfare.client.CustomGunRenderer; import com.atsuishio.superbwarfare.client.model.item.MarlinItemModel; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.item.gun.rifle.MarlinItem; @@ -10,23 +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.ItemStack; import software.bernie.geckolib.cache.object.GeoBone; -public class MarlinItemRenderer extends CustomRenderer { +public class MarlinItemRenderer extends CustomGunRenderer { public MarlinItemRenderer() { super(new MarlinItemModel()); } - @Override - public RenderType getRenderType(MarlinItem animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { - return RenderType.entityTranslucent(getTextureLocation(animatable)); - } - - private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; - @Override public void renderRecursively(PoseStack stack, MarlinItem animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, int color) { Minecraft mc = Minecraft.getInstance(); @@ -49,9 +41,4 @@ public class MarlinItemRenderer extends CustomRenderer { } super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); } - - @Override - public ResourceLocation getTextureLocation(MarlinItem instance) { - return super.getTextureLocation(instance); - } } 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 ad09ea7b7..9471a5cf5 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,7 +1,7 @@ package com.atsuishio.superbwarfare.client.renderer.item; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.CustomRenderer; +import com.atsuishio.superbwarfare.client.CustomGunRenderer; import com.atsuishio.superbwarfare.client.model.item.MinigunItemModel; import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.item.gun.GunItem; @@ -11,23 +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.ItemStack; import software.bernie.geckolib.cache.object.GeoBone; -public class MinigunItemRenderer extends CustomRenderer { +public class MinigunItemRenderer extends CustomGunRenderer { public MinigunItemRenderer() { super(new MinigunItemModel()); } - @Override - public RenderType getRenderType(MinigunItem animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { - return RenderType.entityTranslucent(getTextureLocation(animatable)); - } - - private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; - @Override public void renderRecursively(PoseStack stack, MinigunItem animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, int color) { Minecraft mc = Minecraft.getInstance(); @@ -57,9 +49,4 @@ public class MinigunItemRenderer extends CustomRenderer { } super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); } - - @Override - public ResourceLocation getTextureLocation(MinigunItem instance) { - return super.getTextureLocation(instance); - } } 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 0251760c3..cf862eaf6 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,7 +1,7 @@ package com.atsuishio.superbwarfare.client.renderer.item; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.CustomRenderer; +import com.atsuishio.superbwarfare.client.CustomGunRenderer; import com.atsuishio.superbwarfare.client.model.item.Mp443ItemModel; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.item.gun.handgun.Mp443Item; @@ -10,23 +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.ItemStack; import software.bernie.geckolib.cache.object.GeoBone; -public class Mp443ItemRenderer extends CustomRenderer { +public class Mp443ItemRenderer extends CustomGunRenderer { public Mp443ItemRenderer() { super(new Mp443ItemModel()); } - @Override - public RenderType getRenderType(Mp443Item animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { - return RenderType.entityTranslucent(getTextureLocation(animatable)); - } - - private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; - @Override public void renderRecursively(PoseStack stack, Mp443Item animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, int color) { Minecraft mc = Minecraft.getInstance(); @@ -49,9 +41,4 @@ public class Mp443ItemRenderer extends CustomRenderer { } super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); } - - @Override - public ResourceLocation getTextureLocation(Mp443Item instance) { - return super.getTextureLocation(instance); - } } 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 658fd0feb..3d6c3445b 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,7 @@ package com.atsuishio.superbwarfare.client.renderer.item; import com.atsuishio.superbwarfare.client.AnimationHelper; -import com.atsuishio.superbwarfare.client.CustomRenderer; +import com.atsuishio.superbwarfare.client.CustomGunRenderer; import com.atsuishio.superbwarfare.client.model.item.SecondaryCataclysmModel; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.item.gun.launcher.SecondaryCataclysm; @@ -10,23 +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.ItemStack; import software.bernie.geckolib.cache.object.GeoBone; -public class SecondaryCataclysmRenderer extends CustomRenderer { +public class SecondaryCataclysmRenderer extends CustomGunRenderer { public SecondaryCataclysmRenderer() { super(new SecondaryCataclysmModel()); } - @Override - public RenderType getRenderType(SecondaryCataclysm animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { - return RenderType.entityTranslucent(getTextureLocation(animatable)); - } - - private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; - @Override public void renderRecursively(PoseStack stack, SecondaryCataclysm animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, int color) { Minecraft mc = Minecraft.getInstance(); @@ -49,9 +41,4 @@ public class SecondaryCataclysmRenderer extends CustomRenderer { +public class SentinelItemRenderer extends CustomGunRenderer { public SentinelItemRenderer() { super(new SentinelItemModel()); } - @Override - public RenderType getRenderType(SentinelItem animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { - return RenderType.entityTranslucent(getTextureLocation(animatable)); - } - - private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; - @Override public void renderRecursively(PoseStack stack, SentinelItem animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, int color) { Minecraft mc = Minecraft.getInstance(); @@ -60,9 +52,4 @@ public class SentinelItemRenderer extends CustomRenderer { } super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); } - - @Override - public ResourceLocation getTextureLocation(SentinelItem instance) { - return super.getTextureLocation(instance); - } } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/special/ContainerBlockPreview.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/special/ContainerBlockPreview.java index 8edb41b7a..f413d4973 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/special/ContainerBlockPreview.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/special/ContainerBlockPreview.java @@ -2,7 +2,7 @@ package com.atsuishio.superbwarfare.client.renderer.special; import com.atsuishio.superbwarfare.block.ContainerBlock; import com.atsuishio.superbwarfare.block.entity.ContainerBlockEntity; -import com.atsuishio.superbwarfare.client.renderer.CustomRenderType; +import com.atsuishio.superbwarfare.client.renderer.ModRenderTypes; import com.atsuishio.superbwarfare.item.Crowbar; import net.minecraft.client.Minecraft; import net.minecraft.world.level.ClipContext; @@ -80,7 +80,7 @@ public class ContainerBlockPreview { var blue = 0.0f; var alpha = 0.2f; - var builder = Minecraft.getInstance().renderBuffers().bufferSource().getBuffer(CustomRenderType.BLOCK_OVERLAY); + var builder = Minecraft.getInstance().renderBuffers().bufferSource().getBuffer(ModRenderTypes.BLOCK_OVERLAY); var m4f = poseStack.last().pose(); // east diff --git a/src/main/java/com/atsuishio/superbwarfare/client/ClientSoundHandler.java b/src/main/java/com/atsuishio/superbwarfare/client/sound/ClientSoundHandler.java similarity index 97% rename from src/main/java/com/atsuishio/superbwarfare/client/ClientSoundHandler.java rename to src/main/java/com/atsuishio/superbwarfare/client/sound/ClientSoundHandler.java index 98fae0819..d770a002d 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/ClientSoundHandler.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/sound/ClientSoundHandler.java @@ -1,4 +1,4 @@ -package com.atsuishio.superbwarfare.client; +package com.atsuishio.superbwarfare.client.sound; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.LoudlyEntity; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/LoudlyEntitySoundInstance.java b/src/main/java/com/atsuishio/superbwarfare/client/sound/LoudlyEntitySoundInstance.java similarity index 98% rename from src/main/java/com/atsuishio/superbwarfare/client/LoudlyEntitySoundInstance.java rename to src/main/java/com/atsuishio/superbwarfare/client/sound/LoudlyEntitySoundInstance.java index b0c20e3e5..4ad69c6c2 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/LoudlyEntitySoundInstance.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/sound/LoudlyEntitySoundInstance.java @@ -1,4 +1,4 @@ -package com.atsuishio.superbwarfare.client; +package com.atsuishio.superbwarfare.client.sound; import com.atsuishio.superbwarfare.entity.LoudlyEntity; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/VehicleFireSoundInstance.java b/src/main/java/com/atsuishio/superbwarfare/client/sound/VehicleFireSoundInstance.java similarity index 98% rename from src/main/java/com/atsuishio/superbwarfare/client/VehicleFireSoundInstance.java rename to src/main/java/com/atsuishio/superbwarfare/client/sound/VehicleFireSoundInstance.java index 70633d79d..f5d8fb4d5 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/VehicleFireSoundInstance.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/sound/VehicleFireSoundInstance.java @@ -1,4 +1,4 @@ -package com.atsuishio.superbwarfare.client; +package com.atsuishio.superbwarfare.client.sound; import com.atsuishio.superbwarfare.entity.vehicle.A10Entity; import com.atsuishio.superbwarfare.entity.vehicle.Hpj11Entity; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/VehicleSoundInstance.java b/src/main/java/com/atsuishio/superbwarfare/client/sound/VehicleSoundInstance.java similarity index 99% rename from src/main/java/com/atsuishio/superbwarfare/client/VehicleSoundInstance.java rename to src/main/java/com/atsuishio/superbwarfare/client/sound/VehicleSoundInstance.java index 10529daf3..74550abfa 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/VehicleSoundInstance.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/sound/VehicleSoundInstance.java @@ -1,4 +1,4 @@ -package com.atsuishio.superbwarfare.client; +package com.atsuishio.superbwarfare.client.sound; import com.atsuishio.superbwarfare.entity.vehicle.DroneEntity; import com.atsuishio.superbwarfare.entity.vehicle.base.MobileVehicleEntity;