kalle/superb-warfare
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

清理代码，移动部分类

Browse source
This commit is contained in:
17146 2025-05-18 17:01:18 +08:00 • committed by Light_Quanta
parent 9978935a4a
commit 3ef74beeb7
No known key found for this signature in database
GPG key ID: 11A39A1B8C890959
25 changed files with 62 additions and 208 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/com/atsuishio/superbwarfare/client/AnimationHelper.java
View file

@ -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;

13
src/main/java/com/atsuishio/superbwarfare/client/CustomRenderer.java → src/main/java/com/atsuishio/superbwarfare/client/CustomGunRenderer.java
View file

@ -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<T extends Item & GeoAnimatable> extends GeoItemRenderer<T> {
public class CustomGunRenderer<T extends Item & GeoAnimatable> extends GeoItemRenderer<T> {
public static final float SCALE_RECIPROCAL = 1.0f / 16.0f;
protected T animatable;
protected boolean renderArms = false;
@ -26,7 +30,7 @@ public class CustomRenderer<T extends Item & GeoAnimatable> extends GeoItemRende
protected RenderType renderType;
public ItemDisplayContext transformType;
public CustomRenderer(GeoModel<T> model) {
public CustomGunRenderer(GeoModel<T> model) {
super(model);
}
@ -48,6 +52,11 @@ public class CustomRenderer<T extends Item & GeoAnimatable> 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();

2
src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/AnnihilatorGlowLayer.java
View file

@ -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;

2
src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/Hpj11Layer.java
View file

@ -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;

2
src/main/java/com/atsuishio/superbwarfare/client/layer/vehicle/Yx100GlowLayer.java
View file

@ -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;

24
src/main/java/com/atsuishio/superbwarfare/client/renderer/CustomRenderType.java
View file

@ -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));
}

16
src/main/java/com/atsuishio/superbwarfare/client/ModRenderTypes.java → src/main/java/com/atsuishio/superbwarfare/client/renderer/ModRenderTypes.java
View file

@ -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;
@ -36,7 +36,6 @@ public class ModRenderTypes extends RenderType {
});
// 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));
}

4
src/main/java/com/atsuishio/superbwarfare/client/renderer/block/ChargingStationBlockEntityRenderer.java
View file

@ -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<C
var alpha = 0.2f;
var builder = bufferSource.getBuffer(CustomRenderType.BLOCK_OVERLAY);
var builder = bufferSource.getBuffer(ModRenderTypes.BLOCK_OVERLAY);
var m4f = poseStack.last().pose();
// east

2
src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/AbstractLaserEntityRenderer.java
View file

@ -1,6 +1,6 @@
package com.atsuishio.superbwarfare.client.renderer.entity;
import com.atsuishio.superbwarfare.client.ModRenderTypes;
import com.atsuishio.superbwarfare.client.renderer.ModRenderTypes;
import com.atsuishio.superbwarfare.entity.projectile.AbstractLaserEntity;
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.VertexConsumer;

20
src/main/java/com/atsuishio/superbwarfare/client/renderer/item/BocekItemRenderer.java
View file

@ -1,9 +1,9 @@
package com.atsuishio.superbwarfare.client.renderer.item;
import com.atsuishio.superbwarfare.client.AnimationHelper;
import com.atsuishio.superbwarfare.client.CustomRenderer;
import com.atsuishio.superbwarfare.client.ModRenderTypes;
import com.atsuishio.superbwarfare.client.CustomGunRenderer;
import com.atsuishio.superbwarfare.client.model.item.BocekItemModel;
import com.atsuishio.superbwarfare.client.renderer.ModRenderTypes;
import com.atsuishio.superbwarfare.data.gun.GunData;
import com.atsuishio.superbwarfare.event.ClientEventHandler;
import com.atsuishio.superbwarfare.item.gun.GunItem;
@ -14,26 +14,18 @@ import net.minecraft.client.Minecraft;
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.util.FastColor;
import net.minecraft.world.item.ItemStack;
import org.joml.Matrix4f;
import software.bernie.geckolib.cache.object.GeoBone;
import software.bernie.geckolib.util.RenderUtil;
public class BocekItemRenderer extends CustomRenderer<BocekItem> {
public class BocekItemRenderer extends CustomGunRenderer<BocekItem> {
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<BocekItem> {
}
super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color);
}
@Override
public ResourceLocation getTextureLocation(BocekItem instance) {
return super.getTextureLocation(instance);
}
}

17
src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Glock17ItemRenderer.java
View file

@ -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<Glock17Item> {
public class Glock17ItemRenderer extends CustomGunRenderer<Glock17Item> {
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<Glock17Item> {
}
super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color);
}
@Override
public ResourceLocation getTextureLocation(Glock17Item instance) {
return super.getTextureLocation(instance);
}
}

17
src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Glock18ItemRenderer.java
View file

@ -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<Glock18Item> {
public class Glock18ItemRenderer extends CustomGunRenderer<Glock18Item> {
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<Glock18Item> {
}
super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color);
}
@Override
public ResourceLocation getTextureLocation(Glock18Item instance) {
return super.getTextureLocation(instance);
}
}

17
src/main/java/com/atsuishio/superbwarfare/client/renderer/item/HuntingRifleItemRenderer.java
View file

@ -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<HuntingRifleItem> {
public class HuntingRifleItemRenderer extends CustomGunRenderer<HuntingRifleItem> {
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<HuntingRifleItem> {
}
super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color);
}
@Override
public ResourceLocation getTextureLocation(HuntingRifleItem instance) {
return super.getTextureLocation(instance);
}
}

17
src/main/java/com/atsuishio/superbwarfare/client/renderer/item/K98ItemRenderer.java
View file

@ -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<K98Item> {
public class K98ItemRenderer extends CustomGunRenderer<K98Item> {
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<K98Item> {
}
super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color);
}
@Override
public ResourceLocation getTextureLocation(K98Item instance) {
return super.getTextureLocation(instance);
}
}

17
src/main/java/com/atsuishio/superbwarfare/client/renderer/item/M4ItemRenderer.java
View file

@ -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<M4Item> {
public class M4ItemRenderer extends CustomGunRenderer<M4Item> {
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<M4Item> {
}
super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color);
}
@Override
public ResourceLocation getTextureLocation(M4Item instance) {
return super.getTextureLocation(instance);
}
}

17
src/main/java/com/atsuishio/superbwarfare/client/renderer/item/MarlinItemRenderer.java
View file

@ -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<MarlinItem> {
public class MarlinItemRenderer extends CustomGunRenderer<MarlinItem> {
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<MarlinItem> {
}
super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color);
}
@Override
public ResourceLocation getTextureLocation(MarlinItem instance) {
return super.getTextureLocation(instance);
}
}

17
src/main/java/com/atsuishio/superbwarfare/client/renderer/item/MinigunItemRenderer.java
View file

@ -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<MinigunItem> {
public class MinigunItemRenderer extends CustomGunRenderer<MinigunItem> {
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<MinigunItem> {
}
super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color);
}
@Override
public ResourceLocation getTextureLocation(MinigunItem instance) {
return super.getTextureLocation(instance);
}
}

17
src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Mp443ItemRenderer.java
View file

@ -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<Mp443Item> {
public class Mp443ItemRenderer extends CustomGunRenderer<Mp443Item> {
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<Mp443Item> {
}
super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color);
}
@Override
public ResourceLocation getTextureLocation(Mp443Item instance) {
return super.getTextureLocation(instance);
}
}

17
src/main/java/com/atsuishio/superbwarfare/client/renderer/item/SecondaryCataclysmRenderer.java
View file

@ -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<SecondaryCataclysm> {
public class SecondaryCataclysmRenderer extends CustomGunRenderer<SecondaryCataclysm> {
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<SecondaryCataclys
}
super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color);
}
@Override
public ResourceLocation getTextureLocation(SecondaryCataclysm instance) {
return super.getTextureLocation(instance);
}
}

17
src/main/java/com/atsuishio/superbwarfare/client/renderer/item/SentinelItemRenderer.java
View file

@ -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.SentinelItemModel;
import com.atsuishio.superbwarfare.item.gun.GunItem;
import com.atsuishio.superbwarfare.item.gun.sniper.SentinelItem;
@ -10,24 +10,16 @@ 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 net.neoforged.neoforge.capabilities.Capabilities;
import software.bernie.geckolib.cache.object.GeoBone;
public class SentinelItemRenderer extends CustomRenderer<SentinelItem> {
public class SentinelItemRenderer extends CustomGunRenderer<SentinelItem> {
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<SentinelItem> {
}
super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color);
}
@Override
public ResourceLocation getTextureLocation(SentinelItem instance) {
return super.getTextureLocation(instance);
}
}

4
src/main/java/com/atsuishio/superbwarfare/client/renderer/special/ContainerBlockPreview.java
View file

@ -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

2
src/main/java/com/atsuishio/superbwarfare/client/ClientSoundHandler.java → src/main/java/com/atsuishio/superbwarfare/client/sound/ClientSoundHandler.java
View file

@ -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;

2
src/main/java/com/atsuishio/superbwarfare/client/LoudlyEntitySoundInstance.java → src/main/java/com/atsuishio/superbwarfare/client/sound/LoudlyEntitySoundInstance.java
View file

@ -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;

2
src/main/java/com/atsuishio/superbwarfare/client/VehicleFireSoundInstance.java → src/main/java/com/atsuishio/superbwarfare/client/sound/VehicleFireSoundInstance.java
View file

@ -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;

2
src/main/java/com/atsuishio/superbwarfare/client/VehicleSoundInstance.java → src/main/java/com/atsuishio/superbwarfare/client/sound/VehicleSoundInstance.java
View file

@ -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;