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

修复M134过热无法冷却的问题

Browse source
This commit is contained in:
Light_Quanta 2025-04-02 03:23:22 +08:00
parent 7f9346cfd9
commit e79c20caed
No known key found for this signature in database
GPG key ID: 11A39A1B8C890959
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/atsuishio/superbwarfare/client/layer/gun/VectorLayer.java
View file

@ -22,6 +22,6 @@ public class VectorLayer extends GeoRenderLayer<VectorItem> {
@Override @Override
public void render(PoseStack poseStack, VectorItem animatable, BakedGeoModel bakedModel, RenderType renderType, MultiBufferSource bufferSource, VertexConsumer buffer, float partialTick, int packedLight, int packedOverlay) { 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); RenderType glowRenderType = RenderType.eyes(LAYER);
getRenderer().reRender(getDefaultBakedModel(animatable), poseStack, bufferSource, animatable, glowRenderType, bufferSource.getBuffer(glowRenderType), partialTick, packedLight, OverlayTexture.NO_OVERLAY, -1); getRenderer().reRender(getDefaultBakedModel(animatable), poseStack, bufferSource, animatable, glowRenderType, bufferSource.getBuffer(glowRenderType), partialTick, packedLight, OverlayTexture.NO_OVERLAY, 0xFFFFFFFF);
} }
} }

18
src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/MinigunItem.java
View file

@ -95,8 +95,8 @@ public class MinigunItem extends GunItem implements GeoItem {
@Override @Override
@ParametersAreNonnullByDefault @ParametersAreNonnullByDefault
public void inventoryTick(ItemStack itemstack, Level world, Entity entity, int slot, boolean selected) { public void inventoryTick(ItemStack stack, Level world, Entity entity, int slot, boolean selected) {
super.inventoryTick(itemstack, world, entity, slot, selected); super.inventoryTick(stack, world, entity, slot, selected);
float yRot = entity.getYRot(); float yRot = entity.getYRot();
if (yRot < 0) { if (yRot < 0) {
@ -105,12 +105,10 @@ public class MinigunItem extends GunItem implements GeoItem {
yRot = yRot + 90 % 360; yRot = yRot + 90 % 360;
var leftPos = new Vector3d(1.2, -0.3, 0.3); var leftPos = new Vector3d(1.2, -0.3, 0.3);
if (entity.isSprinting()) { if (entity.isSprinting()) {
leftPos = new Vector3d(1., -0.4, -0.4); leftPos = new Vector3d(1., -0.4, -0.4);
} }
leftPos.rotateZ(-entity.getXRot() * Mth.DEG_TO_RAD); leftPos.rotateZ(-entity.getXRot() * Mth.DEG_TO_RAD);
leftPos.rotateY(-yRot * Mth.DEG_TO_RAD); leftPos.rotateY(-yRot * Mth.DEG_TO_RAD);
@ -123,7 +121,8 @@ public class MinigunItem extends GunItem implements GeoItem {
cooldown = -0.1; cooldown = -0.1;
} }
if (entity instanceof ServerPlayer serverPlayer && entity.level() instanceof ServerLevel serverLevel && NBTTool.getTag(itemstack).getDouble("heat") > 4 && entity.isInWaterOrRain()) { var tag = NBTTool.getTag(stack);
if (entity instanceof ServerPlayer serverPlayer && entity.level() instanceof ServerLevel serverLevel && tag.getDouble("heat") > 4 && entity.isInWaterOrRain()) {
if (entity.isInWater()) { if (entity.isInWater()) {
ParticleTool.sendParticle(serverLevel, ParticleTypes.BUBBLE_COLUMN_UP, ParticleTool.sendParticle(serverLevel, ParticleTypes.BUBBLE_COLUMN_UP,
entity.getX() + leftPos.x, entity.getX() + leftPos.x,
@ -138,11 +137,12 @@ public class MinigunItem extends GunItem implements GeoItem {
1, 0.1, 0.1, 0.1, 0.002, true, serverPlayer); 1, 0.1, 0.1, 0.1, 0.002, true, serverPlayer);
} }
NBTTool.getTag(itemstack).putDouble("heat", Mth.clamp(NBTTool.getTag(itemstack).getDouble("heat") - 0.05 - cooldown, 0, 55)); tag.putDouble("heat", Mth.clamp(tag.getDouble("heat") - 0.05 - cooldown, 0, 55));
if (tag.getDouble("overheat") > 0) {
if (NBTTool.getTag(itemstack).getDouble("overheat") > 0) { tag.putDouble("overheat", (tag.getDouble("overheat") - 1));
NBTTool.getTag(itemstack).putDouble("overheat", (NBTTool.getTag(itemstack).getDouble("overheat") - 1));
} }
NBTTool.saveTag(stack, tag);
} }
public static ItemStack getGunInstance() { public static ItemStack getGunInstance() {