修复加特林火焰

This commit is contained in:
Atsuihsio 2024-08-19 22:03:44 +08:00
parent f1bd07a25f
commit de583bc566
4 changed files with 7 additions and 9 deletions

View file

@ -33,8 +33,6 @@ public class MinigunItemModel extends GeoModel<Minigun> {
public void setCustomAnimations(Minigun animatable, long instanceId, AnimationState animationState) { public void setCustomAnimations(Minigun animatable, long instanceId, AnimationState animationState) {
CoreGeoBone gun = getAnimationProcessor().getBone("barrel"); CoreGeoBone gun = getAnimationProcessor().getBone("barrel");
CoreGeoBone shen = getAnimationProcessor().getBone("shen"); CoreGeoBone shen = getAnimationProcessor().getBone("shen");
CoreGeoBone flare = getAnimationProcessor().getBone("flare");
CoreGeoBone light = getAnimationProcessor().getBone("light");
CoreGeoBone heat_barrels = getAnimationProcessor().getBone("heatbarrels"); CoreGeoBone heat_barrels = getAnimationProcessor().getBone("heatbarrels");
Player player = Minecraft.getInstance().player; Player player = Minecraft.getInstance().player;

View file

@ -84,7 +84,7 @@ public class MinigunItemRenderer extends GeoItemRenderer<Minigun> {
} }
if (name.equals("flare")) { if (name.equals("flare")) {
if (itemStack != null && itemStack.getOrCreateTag().getDouble("flash_time") > 0) { if (itemStack != null && itemStack.getOrCreateTag().getDouble("fire_animation") > 0) {
bone.setHidden(false); bone.setHidden(false);
bone.setScaleX((float) (1 + 0.5 * (Math.random() - 0.5))); bone.setScaleX((float) (1 + 0.5 * (Math.random() - 0.5)));
bone.setScaleY((float) (1 + 0.5 * (Math.random() - 0.5))); bone.setScaleY((float) (1 + 0.5 * (Math.random() - 0.5)));
@ -95,7 +95,7 @@ public class MinigunItemRenderer extends GeoItemRenderer<Minigun> {
} }
if (name.equals("light")) { if (name.equals("light")) {
bone.setHidden(itemStack == null || !(itemStack.getOrCreateTag().getDouble("flash_time") > 0)); bone.setHidden(itemStack == null || !(itemStack.getOrCreateTag().getDouble("fire_animation") > 0));
} }
if (this.transformType.firstPerson() && renderingArms) { if (this.transformType.firstPerson() && renderingArms) {

View file

@ -5,11 +5,11 @@
"zoomSpread": 3, "zoomSpread": 3,
"recoil_x": 0.006, "recoil_x": 0.006,
"recoil_y": 0.018, "recoil_y": 0.018,
"damage": 2, "damage": 2.5,
"headshot": 1.5, "headshot": 1.5,
"velocity": 16, "velocity": 16,
"mag": 25, "mag": 25,
"projectile_amount": 8, "projectile_amount": 12,
"fire_interval": 4, "fire_interval": 4,
"weight": 1, "weight": 1,
"fire_mode": 2, "fire_mode": 2,

View file

@ -1,15 +1,15 @@
{ {
"zoom_speed": 1.4, "zoom_speed": 1.4,
"zoom": 1.25, "zoom": 1.25,
"spread": 5, "spread": 4,
"zoomSpread": 4, "zoomSpread": 3,
"recoil_x": 0.005, "recoil_x": 0.005,
"recoil_y": 0.026, "recoil_y": 0.026,
"damage": 3, "damage": 3,
"headshot": 1.5, "headshot": 1.5,
"velocity": 12, "velocity": 12,
"mag": 2, "mag": 2,
"projectile_amount": 10, "projectile_amount": 12,
"fire_interval": 2, "fire_interval": 2,
"weight": 0, "weight": 0,
"fire_mode": 0, "fire_mode": 0,