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

修改两把mg的渲染

Browse source
This commit is contained in:
17146 2025-05-31 16:54:10 +08:00 • committed by Light_Quanta
parent 99a3f7542f
commit 4aacfbea78
No known key found for this signature in database
GPG key ID: 11A39A1B8C890959
8 changed files with 86 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/main/java/com/atsuishio/superbwarfare/client/model/item/DevotionItemModel.java
View file

@ -4,7 +4,6 @@ import com.atsuishio.superbwarfare.Mod;
import com.atsuishio.superbwarfare.client.AnimationHelper;
import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay;
import com.atsuishio.superbwarfare.event.ClientEventHandler;
import com.atsuishio.superbwarfare.item.gun.GunItem;
import com.atsuishio.superbwarfare.item.gun.machinegun.DevotionItem;
import net.minecraft.client.Minecraft;
import net.minecraft.resources.ResourceLocation;
@ -13,11 +12,10 @@ import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
import software.bernie.geckolib.animation.AnimationState;
import software.bernie.geckolib.cache.object.GeoBone;
import software.bernie.geckolib.model.GeoModel;
import static com.atsuishio.superbwarfare.event.ClientEventHandler.isProne;
public class DevotionItemModel extends GeoModel<DevotionItem> {
public class DevotionItemModel extends CustomGunModel<DevotionItem> {
@Override
public ResourceLocation getAnimationResource(DevotionItem animatable) {
@ -35,17 +33,17 @@ public class DevotionItemModel extends GeoModel<DevotionItem> {
}
@Override
public void setCustomAnimations(DevotionItem animatable, long instanceId, AnimationState animationState) {
public void setCustomAnimations(DevotionItem animatable, long instanceId, AnimationState<DevotionItem> animationState) {
Player player = Minecraft.getInstance().player;
if (player == null) return;
ItemStack stack = player.getMainHandItem();
if (shouldCancelRender(stack, animationState)) return;
GeoBone gun = getAnimationProcessor().getBone("bone");
GeoBone l = getAnimationProcessor().getBone("l");
GeoBone r = getAnimationProcessor().getBone("r");
GeoBone bolt = getAnimationProcessor().getBone("bolt2");
Player player = Minecraft.getInstance().player;
if (player == null) return;
ItemStack stack = player.getMainHandItem();
if (!(stack.getItem() instanceof GunItem)) return;
float times = 0.6f * (float) Math.min(Minecraft.getInstance().getTimer().getRealtimeDeltaTicks(), 0.8);
double zt = ClientEventHandler.zoomTime;
double zp = ClientEventHandler.zoomPos;

30
src/main/java/com/atsuishio/superbwarfare/client/model/item/MinigunItemModel.java
View file

@ -4,7 +4,6 @@ import com.atsuishio.superbwarfare.Mod;
import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay;
import com.atsuishio.superbwarfare.data.gun.GunData;
import com.atsuishio.superbwarfare.event.ClientEventHandler;
import com.atsuishio.superbwarfare.item.gun.GunItem;
import com.atsuishio.superbwarfare.item.gun.machinegun.MinigunItem;
import net.minecraft.client.Minecraft;
import net.minecraft.resources.ResourceLocation;
@ -13,9 +12,10 @@ import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
import software.bernie.geckolib.animation.AnimationState;
import software.bernie.geckolib.cache.object.GeoBone;
import software.bernie.geckolib.model.GeoModel;
public class MinigunItemModel extends GeoModel<MinigunItem> {
public class MinigunItemModel extends CustomGunModel<MinigunItem> {
private static float rotZ = 0.0f;
@Override
public ResourceLocation getAnimationResource(MinigunItem animatable) {
@ -33,25 +33,33 @@ public class MinigunItemModel extends GeoModel<MinigunItem> {
}
@Override
public void setCustomAnimations(MinigunItem animatable, long instanceId, AnimationState animationState) {
GeoBone gun = getAnimationProcessor().getBone("barrel");
GeoBone shen = getAnimationProcessor().getBone("shen");
public void setCustomAnimations(MinigunItem animatable, long instanceId, AnimationState<MinigunItem> animationState) {
Player player = Minecraft.getInstance().player;
if (player == null) return;
ItemStack stack = player.getMainHandItem();
if (!(stack.getItem() instanceof GunItem)) return;
if (shouldCancelRender(stack, animationState)) return;
GeoBone gun = getAnimationProcessor().getBone("barrel");
GeoBone shen = getAnimationProcessor().getBone("shen");
float times = 0.6f * (float) Math.min(Minecraft.getInstance().getTimer().getRealtimeDeltaTicks(), 0.8);
double fpz = ClientEventHandler.firePosZ * 13 * times;
double fp = ClientEventHandler.firePos;
double fr = ClientEventHandler.fireRot;
int rpm = GunData.from(stack).rpm();
var data = GunData.from(stack);
int rpm = data.rpm();
gun.setRotZ(gun.getRotZ() + times * -0.14f * ((float) rpm / 1200) * ClientEventHandler.shootDelay);
float heat = (float) data.heat.get();
for (int i = 1; i <= 6; i++) {
GeoBone bone = getAnimationProcessor().getBone("barrel" + i + "_illuminated");
bone.setScaleZ(heat / 2);
}
rotZ += times * -0.14f * ((float) rpm / 1200) * ClientEventHandler.shootDelay;
gun.setRotZ(rotZ);
shen.setPosX((float) (0.75f * ClientEventHandler.recoilHorizon * fpz * fp));
shen.setPosY((float) (-0.03f * fp - 0.06f * fr));

10
src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/DevotionItemRenderer.java
View file

@ -11,6 +11,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.MultiBufferSource;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.world.item.ItemStack;
import software.bernie.geckolib.animatable.GeoItem;
import software.bernie.geckolib.cache.object.GeoBone;
public class DevotionItemRenderer extends CustomGunRenderer<DevotionItem> {
@ -34,11 +35,10 @@ public class DevotionItemRenderer extends CustomGunRenderer<DevotionItem> {
var player = mc.player;
if (player == null) return;
ItemStack itemStack = player.getMainHandItem();
if (!(itemStack.getItem() instanceof GunItem)) return;
AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0, 1.3875, 0.35);
AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, 0, 0.22993125, 20, 1, 255, 0, 0, 255, "apex_2x", false);
if (itemStack.getItem() instanceof GunItem && GeoItem.getId(itemStack) == this.getInstanceId(animatable)) {
AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0, 1.3875, 0.35);
AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, 0, 0.22993125, 20, 1, 255, 0, 0, 255, "apex_2x", false);
}
if (renderingArms) {
AnimationHelper.renderArms(player, this.transformType, stack, name, bone, buffer, type, packedLightIn, true);

15
src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/MinigunItemRenderer.java
View file

@ -3,7 +3,6 @@ package com.atsuishio.superbwarfare.client.renderer.gun;
import com.atsuishio.superbwarfare.client.AnimationHelper;
import com.atsuishio.superbwarfare.client.model.item.MinigunItemModel;
import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer;
import com.atsuishio.superbwarfare.data.gun.GunData;
import com.atsuishio.superbwarfare.item.gun.GunItem;
import com.atsuishio.superbwarfare.item.gun.machinegun.MinigunItem;
import com.mojang.blaze3d.vertex.PoseStack;
@ -12,6 +11,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.MultiBufferSource;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.world.item.ItemStack;
import software.bernie.geckolib.animatable.GeoItem;
import software.bernie.geckolib.cache.object.GeoBone;
public class MinigunItemRenderer extends CustomGunRenderer<MinigunItem> {
@ -35,19 +35,12 @@ public class MinigunItemRenderer extends CustomGunRenderer<MinigunItem> {
var player = mc.player;
if (player == null) return;
ItemStack itemStack = player.getMainHandItem();
if (!(itemStack.getItem() instanceof GunItem)) return;
var data = GunData.from(itemStack);
float heat = (float) data.heat.get();
if (bone.getName().endsWith("_illuminated")) {
bone.setScaleZ(heat / 2);
if (itemStack.getItem() instanceof GunItem && GeoItem.getId(itemStack) == this.getInstanceId(animatable)) {
AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0.1, 1.45, 0.9);
}
AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0.1, 1.45, 0.9);
if (renderingArms) {
AnimationHelper.renderArms(player, this.transformType, stack, name, bone, this.currentBuffer, type, packedLightIn, true);
AnimationHelper.renderArms(player, this.renderPerspective, stack, name, bone, buffer, type, packedLightIn, true);
}
super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color);
}

17
src/main/java/com/atsuishio/superbwarfare/init/ModEnumExtensions.java
View file

@ -57,5 +57,22 @@ public class ModEnumExtensions {
public static HumanoidModel.ArmPose getAureliaSceptrePose() {
return SUPERBWARFARE_AURELIA_SCEPTRE_POSE.getValue();
}
public static final EnumProxy<HumanoidModel.ArmPose> SUPERBWARFARE_MINIGUN_POSE = new EnumProxy<>(
HumanoidModel.ArmPose.class,
false,
(IArmPoseTransformer) (model, entity, arm) -> {
if (arm != HumanoidArm.LEFT) {
model.rightArm.xRot = -22.5f * Mth.DEG_TO_RAD + model.head.xRot;
model.rightArm.yRot = -10f * Mth.DEG_TO_RAD;
model.leftArm.xRot = -45f * Mth.DEG_TO_RAD + model.head.xRot;
model.leftArm.yRot = 40f * Mth.DEG_TO_RAD;
}
}
);
public static HumanoidModel.ArmPose getMinigunPose() {
return SUPERBWARFARE_MINIGUN_POSE.getValue();
}
}
}

4
src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/DevotionItem.java
View file

@ -11,9 +11,11 @@ import net.minecraft.client.player.LocalPlayer;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemDisplayContext;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Rarity;
import software.bernie.geckolib.animation.*;
import software.bernie.geckolib.constant.DataTickets;
import software.bernie.geckolib.renderer.GeoItemRenderer;
import java.util.Set;
@ -35,6 +37,8 @@ public class DevotionItem extends GunItem {
if (player == null) return PlayState.STOP;
ItemStack stack = player.getMainHandItem();
if (!(stack.getItem() instanceof GunItem)) return PlayState.STOP;
if (event.getData(DataTickets.ITEM_RENDER_PERSPECTIVE) != ItemDisplayContext.FIRST_PERSON_RIGHT_HAND)
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.devotion.idle"));
if (GunData.from(stack).reload.empty()) {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.devotion.reload_empty"));

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

@ -7,11 +7,18 @@ import com.atsuishio.superbwarfare.event.ClientEventHandler;
import com.atsuishio.superbwarfare.init.ModEnumExtensions;
import com.atsuishio.superbwarfare.item.gun.GunItem;
import net.minecraft.client.Minecraft;
import net.minecraft.client.model.HumanoidModel;
import net.minecraft.client.player.LocalPlayer;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemDisplayContext;
import net.minecraft.world.item.ItemStack;
import net.neoforged.api.distmarker.Dist;
import net.neoforged.api.distmarker.OnlyIn;
import software.bernie.geckolib.animation.*;
import software.bernie.geckolib.constant.DataTickets;
import software.bernie.geckolib.renderer.GeoItemRenderer;
import java.util.function.Supplier;
@ -32,11 +39,25 @@ public class MinigunItem extends GunItem {
return MinigunItemRenderer::new;
}
@OnlyIn(Dist.CLIENT)
@Override
public HumanoidModel.ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack stack) {
if (!stack.isEmpty()) {
if (entityLiving.getUsedItemHand() == hand) {
return ModEnumExtensions.Client.getMinigunPose();
}
}
return HumanoidModel.ArmPose.EMPTY;
}
private PlayState idlePredicate(AnimationState<MinigunItem> event) {
LocalPlayer player = Minecraft.getInstance().player;
if (player == null) return PlayState.STOP;
ItemStack stack = player.getMainHandItem();
if (!(stack.getItem() instanceof GunItem)) return PlayState.STOP;
if (event.getData(DataTickets.ITEM_RENDER_PERSPECTIVE) != ItemDisplayContext.FIRST_PERSON_RIGHT_HAND)
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.minigun.idle"));
if (player.isSprinting() && player.onGround() && ClientEventHandler.cantSprint == 0 && ClientEventHandler.drawTime < 0.01) {
if (ClientEventHandler.tacticalSprint) {

9
src/main/resources/META-INF/enumextensions.json
View file

@ -26,6 +26,15 @@
"class": "com/atsuishio/superbwarfare/init/ModEnumExtensions$Client",
"field": "SUPERBWARFARE_AURELIA_SCEPTRE_POSE"
}
},
{
"enum": "net/minecraft/client/model/HumanoidModel$ArmPose",
"name": "SUPERBWARFARE_MINIGUN_POSE",
"constructor": "(ZLnet/neoforged/neoforge/client/IArmPoseTransformer;)V",
"parameters": {
"class": "com/atsuishio/superbwarfare/init/ModEnumExtensions$Client",
"field": "SUPERBWARFARE_MINIGUN_POSE"
}
}
]
}