修复迫击炮弹不爆炸,添加又是一个小细节.jpg

This commit is contained in:
Atsuihsio 2024-05-16 15:18:18 +08:00
parent 75c206d68c
commit e708b11b94
6 changed files with 163 additions and 402 deletions

View file

@ -4,7 +4,7 @@ plugins {
id 'org.spongepowered.mixin' version '0.7.+'
}
version = '0.0.5-SNAPSHOT'
version = '0.0.6-SNAPSHOT'
group = 'com.Atsushio.target'
archivesBaseName = 'target'

View file

@ -85,13 +85,10 @@ public class MortarShellEntity extends AbstractArrow implements ItemSupplier {
@Override
public void onHitBlock(BlockHitResult blockHitResult) {
super.onHitBlock(blockHitResult);
if (this.getPersistentData().getDouble("time") > 0) {
if (this.level() instanceof ServerLevel level) {
level.explode(this, this.getX(), this.getY(), this.getZ(), 10, Level.ExplosionInteraction.NONE);
}
}
}
@Override
public void tick() {
@ -109,35 +106,4 @@ public class MortarShellEntity extends AbstractArrow implements ItemSupplier {
this.discard();
}
}
public static MortarShellEntity shoot(Level world, LivingEntity entity, RandomSource source) {
return shoot(world, entity, source, 1f, 5, 5);
}
public static MortarShellEntity shoot(Level world, LivingEntity entity, RandomSource random, float power, double damage, int knockback) {
MortarShellEntity entityarrow = new MortarShellEntity(TargetModEntities.MORTAR_SHELL.get(), entity, world);
entityarrow.shoot(entity.getViewVector(1).x, entity.getViewVector(1).y, entity.getViewVector(1).z, power * 2, 0);
entityarrow.setSilent(true);
entityarrow.setCritArrow(false);
entityarrow.setBaseDamage(damage);
entityarrow.setKnockback(knockback);
world.addFreshEntity(entityarrow);
world.playSound(null, entity.getX(), entity.getY(), entity.getZ(), ForgeRegistries.SOUND_EVENTS.getValue(new ResourceLocation("entity.arrow.shoot")), SoundSource.PLAYERS, 1, 1f / (random.nextFloat() * 0.5f + 1) + (power / 2));
return entityarrow;
}
public static MortarShellEntity shoot(LivingEntity entity, LivingEntity target) {
MortarShellEntity entityarrow = new MortarShellEntity(TargetModEntities.MORTAR_SHELL.get(), entity, entity.level());
double dx = target.getX() - entity.getX();
double dy = target.getY() + target.getEyeHeight() - 1.1;
double dz = target.getZ() - entity.getZ();
entityarrow.shoot(dx, dy - entityarrow.getY() + Math.hypot(dx, dz) * 0.2F, dz, 1f * 2, 12.0F);
entityarrow.setSilent(true);
entityarrow.setBaseDamage(5);
entityarrow.setKnockback(5);
entityarrow.setCritArrow(false);
entity.level().addFreshEntity(entityarrow);
entity.level().playSound(null, entity.getX(), entity.getY(), entity.getZ(), ForgeRegistries.SOUND_EVENTS.getValue(new ResourceLocation("entity.arrow.shoot")), SoundSource.PLAYERS, 1, 1f / (RandomSource.create().nextFloat() * 0.5f + 1));
return entityarrow;
}
}

View file

@ -547,391 +547,149 @@
"bones": {
"0": {
"rotation": {
"0.0": {
"vector": [0, 0, 0]
},
"0.4": {
"vector": [-17.28398, -2.37555, -14.63743],
"easing": "easeOutQuad"
},
"0.5": {
"vector": [-20.19064, -3.0059, -16.54165]
},
"0.6": {
"vector": [-11.19064, -3.0059, -16.54165]
},
"0.8": {
"vector": [-19.01737, -3.98795, -19.38168]
},
"1.0": {
"vector": [-23.01737, -3.98795, -19.38168]
},
"1.2": {
"vector": [-21.10053, -3.28577, -20.388]
},
"1.4": {
"vector": [-19.67234, -5.99485, -27.70851],
"easing": "easeInElastic"
},
"1.5": {
"vector": [-17.23236, -7.16186, -31.56072]
},
"1.6": {
"vector": [-21.10765, -7.85482, -32.38361]
},
"1.7": {
"vector": [-22.46727, -6.79785, -29.55227]
},
"1.9": {
"vector": [-24.6749, -6.03012, -27.69384]
},
"2.1": {
"vector": [-21.16155, -3.88618, -22.06856]
},
"2.3": {
"vector": [-20.35191, -7.08161, -30.52207]
},
"2.4": {
"vector": [-25.35191, -7.08161, -30.52207],
"easing": "easeInElastic",
"easingArgs": [1]
},
"2.9": {
"vector": [-9.48193, -0.91778, 0.31667],
"easing": "easeInElastic"
},
"3.2": {
"vector": [-6.50386, 0.57584, 8.3899]
},
"3.4": {
"vector": [-6.41457, 1.87406, -2.05028]
},
"3.6": {
"vector": [-2.45848, 0.88846, -2.411]
},
"3.7": {
"vector": [0, 0, 0]
},
"4.0": {
"vector": [0, 0, 0]
}
"0.0": [0, 0, 0],
"0.4": [-17.28398, -2.37555, -14.63743],
"0.5": [-20.19064, -3.0059, -16.54165],
"0.6": [-11.19064, -3.0059, -16.54165],
"0.8": [-19.01737, -3.98795, -19.38168],
"1.0": [-23.01737, -3.98795, -19.38168],
"1.2": [-21.10053, -3.28577, -20.388],
"1.4": [-19.67234, -5.99485, -27.70851],
"1.5": [-17.23236, -7.16186, -31.56072],
"1.6": [-21.10765, -7.85482, -32.38361],
"1.7": [-22.46727, -6.79785, -29.55227],
"1.9": [-24.6749, -6.03012, -27.69384],
"2.1": [-21.16155, -3.88618, -22.06856],
"2.3": [-20.35191, -7.08161, -30.52207],
"2.4": [-25.35191, -7.08161, -30.52207],
"2.9": [-9.48193, -0.91778, 0.31667],
"3.2": [-6.50386, 0.57584, 8.3899],
"3.4": [-6.41457, 1.87406, -2.05028],
"3.6": [-2.45848, 0.88846, -2.411],
"3.7": [0, 0, 0],
"4.0": [0, 0, 0]
},
"position": {
"0.0": {
"vector": [0, 0, 0]
},
"0.4": {
"vector": [0, 0.9, 0.3],
"easing": "easeInElastic"
},
"0.5": {
"vector": [0, 1, 0.3]
},
"0.6": {
"vector": [0.5, 0.7, 0.1]
},
"0.7": {
"vector": [0.3, 1, 0.2]
},
"0.9": {
"vector": [0.4, 0.8, 0.1]
},
"1.1": {
"vector": [0.5, 1.02, 0.2]
},
"1.4": {
"vector": [0.4, 1.2, 0.2],
"easing": "easeInElastic"
},
"1.5": {
"vector": [0.5, 1.1, 0.2]
},
"1.6": {
"vector": [0.5, 1.1, 0.3]
},
"1.8": {
"vector": [0.45703, 1.3, 0.3]
},
"1.9": {
"vector": [0.5, 1.6, 0.3]
},
"2.0": {
"vector": [0.6, 1, 0.3]
},
"2.3": {
"vector": [0.7, 0.8, 0.3]
},
"2.4": {
"vector": [0.3, 1.5, 0.3],
"easing": "easeInElastic",
"easingArgs": [1]
},
"2.6": {
"vector": [0.1, 0.74, 0.4],
"easing": "easeInElastic"
},
"2.9": {
"vector": [0, 0, 0.25],
"easing": "easeInElastic"
},
"3.2": {
"vector": [0, 0, -0.05]
},
"3.3": {
"vector": [-0.2, 0, 0.2]
},
"3.4": {
"vector": [-0.2, 0, 1]
},
"3.5": {
"vector": [0, 0, -0.15]
},
"3.7": {
"vector": [0, 0, -0.35]
},
"3.8": {
"vector": [0, 0, 0.23]
},
"4.0": {
"vector": [0, 0, 0]
}
"0.0": [0, 0, 0],
"0.4": [0, 0.9, 0.3],
"0.5": [0, 1, 0.3],
"0.6": [0.5, 0.7, 0.1],
"0.7": [0.3, 1, 0.2],
"0.9": [0.4, 0.8, 0.1],
"1.1": [0.5, 1.02, 0.2],
"1.4": [0.4, 1.2, 0.2],
"1.5": [0.5, 1.1, 0.2],
"1.6": [0.5, 1.1, 0.3],
"1.8": [0.45703, 1.3, 0.3],
"1.9": [0.5, 1.6, 0.3],
"2.0": [0.6, 1, 0.3],
"2.3": [0.7, 0.8, 0.3],
"2.4": [0.3, 1.5, 0.3],
"2.6": [0.1, 0.74, 0.4],
"2.9": [0, 0, 0.25],
"3.2": [0, 0, -0.05],
"3.3": [-0.2, 0, 0.2],
"3.4": [-0.2, 0, 1],
"3.5": [0, 0, -0.15],
"3.7": [0, 0, -0.35],
"3.8": [0, 0, 0.23],
"4.0": [0, 0, 0]
}
},
"magazine": {
"rotation": {
"0.0": {
"vector": [0, 0, 0]
},
"0.3": {
"vector": [0, 0, 0]
},
"0.5": {
"vector": [-9, 0, 0],
"easing": "easeInSine"
},
"0.7": {
"vector": [39.37235, -2.62403, -2.08221]
},
"1.2": {
"vector": [29.37235, -2.62403, -2.08221]
},
"1.4": {
"vector": [20.37235, -2.62403, -2.08221]
},
"1.6": {
"vector": [-12.62765, -2.62403, -2.08221]
},
"1.7": {
"vector": [-9, 0, 0]
},
"1.8": {
"vector": [7, 0, 0],
"easing": "easeInOutSine"
},
"1.9": {
"vector": [0, 0, 0]
},
"2.3": {
"vector": [0, 0, 0]
},
"2.4": {
"vector": [0, 0, 0],
"easing": "easeInQuad"
}
"0.0": [0, 0, 0],
"0.3": [0, 0, 0],
"0.5": [-9, 0, 0],
"0.7": [39.37235, -2.62403, -2.08221],
"1.2": [29.37235, -2.62403, -2.08221],
"1.4": [20.37235, -2.62403, -2.08221],
"1.6": [-12.62765, -2.62403, -2.08221],
"1.7": [-9, 0, 0],
"1.8": [7, 0, 0],
"1.9": [0, 0, 0],
"2.3": [0, 0, 0],
"2.4": [0, 0, 0]
},
"position": {
"0.0": {
"vector": [0, 0, 0]
},
"0.3": {
"vector": [0, 0, 0]
},
"0.5": {
"vector": [0, 0, 0],
"easing": "easeInSine"
},
"0.7": {
"vector": [0, -12.67, 2.9]
},
"1.2": {
"vector": [4, -7.27, 4.1]
},
"1.4": {
"vector": [1, -4.87, -0.1],
"easing": "easeInSine"
},
"1.5": {
"vector": [0, -2.27, -0.9],
"easing": "easeOutSine"
},
"1.7": {
"vector": [0, -0.45625, -0.1],
"easing": "easeInOutQuad"
},
"1.8": {
"vector": [0, -0.3, 0]
},
"1.9": {
"vector": [0, -0.1, 0]
},
"2.3": {
"vector": [0, -0.1, 0]
},
"2.4": {
"vector": [0, 0, 0],
"easing": "easeInQuad"
}
"0.0": [0, 0, 0],
"0.3": [0, 0, 0],
"0.5": [0, 0, 0],
"0.7": [0, -12.67, 2.9],
"1.2": [4, -7.27, 4.1],
"1.4": [1, -4.87, -0.1],
"1.5": [0, -2.27, -0.9],
"1.7": [0, -0.45625, -0.1],
"1.8": [0, -0.3, 0],
"1.9": [0, -0.1, 0],
"2.3": [0, -0.1, 0],
"2.4": [0, 0, 0]
}
},
"Lefthand": {
"rotation": {
"0.0": {
"vector": [0, 0, 0]
},
"0.3": {
"vector": [11.03847, -21.81212, -4.69866]
},
"0.6": {
"vector": [11.03847, -21.81212, -4.69866]
},
"0.7": {
"vector": [21.40451, 5.32565, 33.55057]
},
"2.0": {
"vector": [21.40451, 5.32565, 33.55057]
},
"2.2": {
"vector": [37.59332, -33.68004, 59.98843],
"easing": "easeInElastic"
},
"2.4": {
"vector": [36.94932, -8.97856, 56.05321],
"easing": "easeInElastic"
},
"2.5": {
"vector": [36.94932, -8.97856, 56.05321],
"easing": "easeInElastic"
},
"2.9": {
"vector": [0, 0, 0],
"easing": "easeOutSine"
}
"0.0": [0, 0, 0],
"0.3": [11.03847, -21.81212, -4.69866],
"0.6": [11.03847, -21.81212, -4.69866],
"0.7": [21.40451, 5.32565, 33.55057],
"2.0": [21.40451, 5.32565, 33.55057],
"2.2": [37.59332, -33.68004, 59.98843],
"2.4": [36.94932, -8.97856, 56.05321],
"2.5": [36.94932, -8.97856, 56.05321],
"2.9": [0, 0, 0]
},
"position": {
"0.1": {
"vector": [0, 0, 0]
},
"0.2": {
"vector": [1.03, 0.2, 4.67]
},
"0.3": {
"vector": [-0.7, 0.3, 5.8]
},
"0.6": {
"vector": [-0.7, 0.3, 5.8]
},
"0.7": {
"vector": [-0.7, -1.2, 5]
},
"2.0": {
"vector": [-0.7, -1.2, 5]
},
"2.2": {
"vector": [-2.96, -1.79, 6.99],
"easing": "easeInElastic"
},
"2.4": {
"vector": [-2.86, -1.59, 7.89],
"easing": "easeInElastic"
},
"2.5": {
"vector": [-2.86, -1.59, 7.89],
"easing": "easeInElastic"
},
"2.7": {
"vector": [0.03, -2, 3.17]
},
"2.9": {
"vector": [0, 0, 0],
"easing": "easeOutSine"
}
"0.1": [0, 0, 0],
"0.2": [1.03, 0.2, 4.67],
"0.3": [-0.7, 0.3, 5.8],
"0.6": [-0.7, 0.3, 5.8],
"0.7": [-0.7, -1.2, 5],
"2.0": [-0.7, -1.2, 5],
"2.2": [-2.96, -1.79, 6.99],
"2.4": [-2.86, -1.59, 7.89],
"2.5": [-2.86, -1.59, 7.89],
"2.7": [0.03, -2, 3.17],
"2.9": [0, 0, 0]
}
},
"holo": {
"position": {
"vector": [0, 0, -251]
}
"position": [0, 0, -251]
},
"bolt": {
"position": {
"3.2": {
"vector": [0, 0, 0]
},
"3.3": {
"vector": [0, 0, 4],
"easing": "easeInCubic"
},
"3.4": {
"vector": [0, 0, 4],
"easing": "easeInCubic"
},
"3.6": {
"vector": [0, 0, 0],
"easing": "easeInElastic"
}
"3.2": [0, 0, 0],
"3.3": [0, 0, 4],
"3.4": [0, 0, 4],
"3.6": [0, 0, 0]
}
},
"Righthand": {
"rotation": {
"3.0": {
"vector": [0, 0, 0]
},
"3.1": {
"vector": [8.28212, 20.95701, 9.9358]
},
"3.2": {
"vector": [-1.95978, 11.17581, -2.65919]
},
"3.3": {
"vector": [-1.95978, 11.17581, -2.65919]
},
"3.4": {
"vector": [-1.95978, 11.17581, -2.65919]
},
"3.7": {
"vector": [19.28212, 20.95701, 9.9358]
},
"3.8": {
"vector": [0, 0, 0],
"easing": "easeInOutSine"
}
"3.0": [0, 0, 0],
"3.1": [8.28212, 20.95701, 9.9358],
"3.2": [-1.95978, 11.17581, -2.65919],
"3.3": [-1.95978, 11.17581, -2.65919],
"3.4": [-1.95978, 11.17581, -2.65919],
"3.7": [19.28212, 20.95701, 9.9358],
"3.8": [0, 0, 0]
},
"position": {
"3.0": {
"vector": [0, 0, 0]
},
"3.1": {
"vector": [1.6, 2.9, 0]
},
"3.2": {
"vector": [0.5, 1.9, -5.3]
},
"3.3": {
"vector": [0.5, 1.9, -1]
},
"3.4": {
"vector": [0.5, 1.9, -1]
},
"3.5": {
"vector": [0.5, 3.5, -5.1]
},
"3.7": {
"vector": [1.6, 2.9, 0]
},
"3.8": {
"vector": [0, 0, 0],
"easing": "easeInOutSine"
"3.0": [0, 0, 0],
"3.1": [1.6, 2.9, 0],
"3.2": [0.5, 1.9, -5.3],
"3.3": [0.5, 1.9, -1],
"3.4": [0.5, 1.9, -1],
"3.5": [0.5, 3.5, -5.1],
"3.7": [1.6, 2.9, 0],
"3.8": [0, 0, 0]
}
},
"bullet": {
"position": {
"0.0": [0, 0, 0],
"0.1": [0, -0.25, 0],
"0.9": [0, -0.25, 0],
"1.0": [0, 0, 0]
}
}
}

View file

@ -7,8 +7,8 @@
"texture_width": 128,
"texture_height": 128,
"visible_bounds_width": 43,
"visible_bounds_height": 6,
"visible_bounds_offset": [0, 0, 0]
"visible_bounds_height": 13,
"visible_bounds_offset": [0, 3.5, 0]
},
"bones": [
{
@ -1371,8 +1371,6 @@
{
"origin": [0.38563, 4.17874, -0.99492],
"size": [0.23009, 0.19554, 0.89945],
"pivot": [0.7693, 4.73666, 0.25223],
"rotation": [0, 0, 0],
"uv": {
"north": {"uv": [32, 83], "uv_size": [0.25, 0.25]},
"east": {"uv": [63, 32], "uv_size": [1, 0.25]},
@ -2450,8 +2448,6 @@
{
"origin": [0.4112, 4.30727, 1.25598],
"size": [0.17896, 0.06398, 0.56388],
"pivot": [0.7096, 4.74121, 1.53792],
"rotation": [0, 0, 0],
"uv": {
"north": {"uv": [82, 41], "uv_size": [0.25, 0.25]},
"east": {"uv": [69, 67], "uv_size": [0.5, 0.25]},
@ -2744,8 +2740,6 @@
{
"origin": [0.40135, 4.25778, 0.75598],
"size": [0.19864, 0.07101, 0.56953],
"pivot": [0.73259, 4.73946, 1.56893],
"rotation": [0, 0, 0],
"uv": {
"north": {"uv": [82, 50], "uv_size": [0.25, 0.25]},
"east": {"uv": [16, 70], "uv_size": [0.5, 0.25]},
@ -10909,6 +10903,49 @@
}
]
},
{
"name": "bullet",
"parent": "magazine",
"pivot": [0.47939, 1.74351, -1.31168],
"cubes": [
{
"origin": [0.30036, 1.56448, -1.97461],
"size": [0.35805, 0.35805, 1.07423],
"uv": {
"north": {"uv": [55.5, 88.375], "uv_size": [-0.75, -3.25]},
"east": {"uv": [55.5, 88.375], "uv_size": [-0.75, -3.25]},
"south": {"uv": [55.5, 88.375], "uv_size": [-0.75, -3.25]},
"west": {"uv": [55.5, 88.375], "uv_size": [-0.75, -3.25]},
"up": {"uv": [54.75, 85.125], "uv_size": [0.75, 3.25]},
"down": {"uv": [54.75, 85.125], "uv_size": [0.75, 3.25]}
}
},
{
"origin": [0.34656, 1.61068, -2.52224],
"size": [0.26565, 0.26565, 1.76047],
"uv": {
"north": {"uv": [65.5, 87.5], "uv_size": [-0.75, -3.25]},
"east": {"uv": [65.5, 87.5], "uv_size": [-0.75, -3.25]},
"south": {"uv": [65.5, 87.5], "uv_size": [-0.75, -3.25]},
"west": {"uv": [65.5, 87.5], "uv_size": [-0.75, -3.25]},
"up": {"uv": [64.75, 84.25], "uv_size": [0.75, 3.25]},
"down": {"uv": [64.75, 84.25], "uv_size": [0.75, 3.25]}
}
},
{
"origin": [0.30036, 1.56448, -0.80798],
"size": [0.35805, 0.35805, 0.0924],
"uv": {
"north": {"uv": [55.5, 88.375], "uv_size": [-0.75, -3.25]},
"east": {"uv": [55.5, 88.375], "uv_size": [-0.75, -3.25]},
"south": {"uv": [55.5, 88.375], "uv_size": [-0.75, -3.25]},
"west": {"uv": [55.5, 88.375], "uv_size": [-0.75, -3.25]},
"up": {"uv": [54.75, 85.125], "uv_size": [0.75, 3.25]},
"down": {"uv": [54.75, 85.125], "uv_size": [0.75, 3.25]}
}
}
]
},
{
"name": "Righthand",
"parent": "0",

Binary file not shown.

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 31 KiB