删除M4的手臂
This commit is contained in:
parent
4db8d97bc6
commit
954862d710
3 changed files with 13 additions and 89 deletions
|
@ -33,81 +33,6 @@ public class M4ItemRenderer extends GeoItemRenderer<M4Item> {
|
||||||
this.addRenderLayer(new M4Layer(this));
|
this.addRenderLayer(new M4Layer(this));
|
||||||
}
|
}
|
||||||
|
|
||||||
@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;
|
|
||||||
protected boolean renderArms = false;
|
|
||||||
protected MultiBufferSource currentBuffer;
|
|
||||||
protected RenderType renderType;
|
|
||||||
public ItemDisplayContext transformType;
|
|
||||||
protected M4Item animatable;
|
|
||||||
private final Set<String> hiddenBones = new HashSet<>();
|
|
||||||
private final Set<String> suppressedBones = new HashSet<>();
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void renderByItem(ItemStack stack, ItemDisplayContext transformType, PoseStack matrixStack, MultiBufferSource bufferIn, int combinedLightIn, int p_239207_6_) {
|
|
||||||
this.transformType = transformType;
|
|
||||||
if (this.animatable != null)
|
|
||||||
this.animatable.getTransformType(transformType);
|
|
||||||
super.renderByItem(stack, transformType, matrixStack, bufferIn, combinedLightIn, p_239207_6_);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void actuallyRender(PoseStack matrixStackIn, M4Item animatable, BakedGeoModel model, RenderType type, MultiBufferSource renderTypeBuffer, VertexConsumer vertexBuilder, boolean isRenderer, float partialTicks, int packedLightIn,
|
|
||||||
int packedOverlayIn, float red, float green, float blue, float alpha) {
|
|
||||||
this.currentBuffer = renderTypeBuffer;
|
|
||||||
this.renderType = type;
|
|
||||||
this.animatable = animatable;
|
|
||||||
super.actuallyRender(matrixStackIn, animatable, model, type, renderTypeBuffer, vertexBuilder, isRenderer, partialTicks, packedLightIn, packedOverlayIn, red, green, blue, alpha);
|
|
||||||
if (this.renderArms) {
|
|
||||||
this.renderArms = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void renderRecursively(PoseStack stack, M4Item animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, float red,
|
|
||||||
float green, float blue, float alpha) {
|
|
||||||
Minecraft mc = Minecraft.getInstance();
|
|
||||||
String name = bone.getName();
|
|
||||||
boolean renderingArms = false;
|
|
||||||
if (name.equals("Lefthand") || name.equals("Righthand")) {
|
|
||||||
bone.setHidden(true);
|
|
||||||
renderingArms = true;
|
|
||||||
} else {
|
|
||||||
bone.setHidden(this.hiddenBones.contains(name));
|
|
||||||
}
|
|
||||||
if (this.transformType.firstPerson() && renderingArms) {
|
|
||||||
AbstractClientPlayer player = mc.player;
|
|
||||||
float armsAlpha = player.isInvisible() ? 0.15f : 1.0f;
|
|
||||||
PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player);
|
|
||||||
PlayerModel<AbstractClientPlayer> model = playerRenderer.getModel();
|
|
||||||
stack.pushPose();
|
|
||||||
RenderUtils.translateMatrixToBone(stack, bone);
|
|
||||||
RenderUtils.translateToPivotPoint(stack, bone);
|
|
||||||
RenderUtils.rotateMatrixAroundBone(stack, bone);
|
|
||||||
RenderUtils.scaleMatrixForBone(stack, bone);
|
|
||||||
RenderUtils.translateAwayFromPivotPoint(stack, bone);
|
|
||||||
ResourceLocation loc = player.getSkinTextureLocation();
|
|
||||||
VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc));
|
|
||||||
VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc));
|
|
||||||
if (name.equals("Lefthand")) {
|
|
||||||
stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f);
|
|
||||||
AnimUtils.renderPartOverBone(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, armsAlpha);
|
|
||||||
AnimUtils.renderPartOverBone(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, armsAlpha);
|
|
||||||
} else if (name.equals("Righthand")) {
|
|
||||||
stack.translate(1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f);
|
|
||||||
AnimUtils.renderPartOverBone(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, armsAlpha);
|
|
||||||
AnimUtils.renderPartOverBone(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, armsAlpha);
|
|
||||||
}
|
|
||||||
this.currentBuffer.getBuffer(RenderType.entityTranslucent(getTextureLocation(this.animatable)));
|
|
||||||
stack.popPose();
|
|
||||||
}
|
|
||||||
super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, red, green, blue, alpha);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ResourceLocation getTextureLocation(M4Item instance) {
|
public ResourceLocation getTextureLocation(M4Item instance) {
|
||||||
return super.getTextureLocation(instance);
|
return super.getTextureLocation(instance);
|
||||||
|
|
|
@ -60,18 +60,20 @@ public class PlayerEventHandler {
|
||||||
|
|
||||||
ItemStack stack = player.getMainHandItem();
|
ItemStack stack = player.getMainHandItem();
|
||||||
|
|
||||||
if (event.phase == TickEvent.Phase.END && stack.is(TargetModTags.Items.GUN)) {
|
if (event.phase == TickEvent.Phase.END) {
|
||||||
handlePlayerProne(player);
|
if (stack.is(TargetModTags.Items.GUN)) {
|
||||||
handlePlayerSprint(player);
|
handlePlayerProne(player);
|
||||||
handleWeaponLevel(player);
|
handlePlayerSprint(player);
|
||||||
handleAmmoCount(player);
|
handleWeaponLevel(player);
|
||||||
handleGround(player);
|
handleAmmoCount(player);
|
||||||
handlePrepareZoom(player);
|
handleGround(player);
|
||||||
handleSpecialWeaponAmmo(player);
|
handlePrepareZoom(player);
|
||||||
handleChangeFireRate(player);
|
handleSpecialWeaponAmmo(player);
|
||||||
|
handleChangeFireRate(player);
|
||||||
|
handleBocekPulling(player);
|
||||||
|
handleGunRecoil(player);
|
||||||
|
}
|
||||||
handleDistantRange(player);
|
handleDistantRange(player);
|
||||||
handleBocekPulling(player);
|
|
||||||
handleGunRecoil(player);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -83,9 +83,6 @@ public class FireMessage {
|
||||||
|
|
||||||
var tag = handItem.getOrCreateTag();
|
var tag = handItem.getOrCreateTag();
|
||||||
|
|
||||||
if (tag.getInt("ammo") == 0) {
|
|
||||||
TargetMod.PACKET_HANDLER.sendToServer(new ReloadMessage(0));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (handItem.getItem() == TargetModItems.TASER.get()) {
|
if (handItem.getItem() == TargetModItems.TASER.get()) {
|
||||||
handleTaserFire(player);
|
handleTaserFire(player);
|
||||||
|
|
Loading…
Add table
Reference in a new issue