修复音效消失bug
This commit is contained in:
parent
6a48fc1286
commit
331cc7eede
5 changed files with 21 additions and 18 deletions
|
@ -8,6 +8,7 @@ import net.mcreator.target.entity.MortarEntity;
|
||||||
import net.mcreator.target.init.TargetModKeyMappings;
|
import net.mcreator.target.init.TargetModKeyMappings;
|
||||||
import net.mcreator.target.init.TargetModMobEffects;
|
import net.mcreator.target.init.TargetModMobEffects;
|
||||||
import net.mcreator.target.init.TargetModTags;
|
import net.mcreator.target.init.TargetModTags;
|
||||||
|
import net.mcreator.target.item.common.ammo.CannonShellItem;
|
||||||
import net.mcreator.target.network.TargetModVariables;
|
import net.mcreator.target.network.TargetModVariables;
|
||||||
import net.mcreator.target.network.message.*;
|
import net.mcreator.target.network.message.*;
|
||||||
import net.mcreator.target.tools.TraceTool;
|
import net.mcreator.target.tools.TraceTool;
|
||||||
|
@ -74,7 +75,9 @@ public class ClickHandler {
|
||||||
if (player.getVehicle() != null && player.getVehicle() instanceof Mk42Entity) {
|
if (player.getVehicle() != null && player.getVehicle() instanceof Mk42Entity) {
|
||||||
event.setCanceled(true);
|
event.setCanceled(true);
|
||||||
TargetMod.PACKET_HANDLER.sendToServer(new VehicleFireMessage(0));
|
TargetMod.PACKET_HANDLER.sendToServer(new VehicleFireMessage(0));
|
||||||
return;
|
if (player.getMainHandItem().getItem() instanceof CannonShellItem) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (player.getMainHandItem().is(TargetModTags.Items.GUN)) {
|
if (player.getMainHandItem().is(TargetModTags.Items.GUN)) {
|
||||||
event.setCanceled(true);
|
event.setCanceled(true);
|
||||||
|
|
|
@ -233,17 +233,16 @@ public class Mk42Entity extends PathfinderMob implements GeoEntity {
|
||||||
this.getPersistentData().putInt("fire_cooldown", this.getPersistentData().getInt("fire_cooldown") - 1);
|
this.getPersistentData().putInt("fire_cooldown", this.getPersistentData().getInt("fire_cooldown") - 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.getPersistentData().getBoolean("firing") && gunner instanceof Player player && this.getPersistentData().getInt("fire_cooldown") == 0) {
|
if (this.getPersistentData().getInt("fire_cooldown") > 28) {
|
||||||
cannonShoot(player);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.getPersistentData().getBoolean("shot")) {
|
|
||||||
gunner.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
|
gunner.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
|
||||||
capability.recoilHorizon = 2 * Math.random() - 1;
|
capability.recoilHorizon = 2 * Math.random() - 1;
|
||||||
capability.cannonFiring = 1;
|
capability.cannonFiring = 1;
|
||||||
capability.syncPlayerVariables(gunner);
|
capability.syncPlayerVariables(gunner);
|
||||||
});
|
});
|
||||||
this.getPersistentData().putBoolean("shot", false);
|
}
|
||||||
|
|
||||||
|
if (this.getPersistentData().getBoolean("firing") && gunner instanceof Player player && this.getPersistentData().getInt("fire_cooldown") == 0) {
|
||||||
|
cannonShoot(player);
|
||||||
}
|
}
|
||||||
|
|
||||||
this.refreshDimensions();
|
this.refreshDimensions();
|
||||||
|
@ -302,7 +301,6 @@ public class Mk42Entity extends PathfinderMob implements GeoEntity {
|
||||||
}
|
}
|
||||||
|
|
||||||
this.getPersistentData().putInt("fire_cooldown", 30);
|
this.getPersistentData().putInt("fire_cooldown", 30);
|
||||||
this.getPersistentData().putBoolean("shot", true);
|
|
||||||
|
|
||||||
server.sendParticles(ParticleTypes.CAMPFIRE_COSY_SMOKE,
|
server.sendParticles(ParticleTypes.CAMPFIRE_COSY_SMOKE,
|
||||||
this.getX() + 5 * this.getLookAngle().x,
|
this.getX() + 5 * this.getLookAngle().x,
|
||||||
|
|
|
@ -108,7 +108,8 @@
|
||||||
"des.target.creative_ammo_box": "Creative Ammo *2147483647",
|
"des.target.creative_ammo_box": "Creative Ammo *2147483647",
|
||||||
"item.target.ammo_supplier.supply": "%s Ammo +%s",
|
"item.target.ammo_supplier.supply": "%s Ammo +%s",
|
||||||
"item.target.ammo_supplier.creative": "All Ammo +2147483647",
|
"item.target.ammo_supplier.creative": "All Ammo +2147483647",
|
||||||
"item.target.he_5_inches": "5'' HE Shell",
|
"item.target.he_5_inches": "HE Shell",
|
||||||
|
"item.target.ap_5_inches": "AP Shell",
|
||||||
|
|
||||||
"item.target.target_deployer": "Target",
|
"item.target.target_deployer": "Target",
|
||||||
"item.target.senpai_spawn_egg": "Senpai Spawn Egg",
|
"item.target.senpai_spawn_egg": "Senpai Spawn Egg",
|
||||||
|
|
|
@ -108,7 +108,8 @@
|
||||||
"des.target.creative_ammo_box": "创造弹药 *2147483647",
|
"des.target.creative_ammo_box": "创造弹药 *2147483647",
|
||||||
"item.target.ammo_supplier.supply": "%s弹药 +%s",
|
"item.target.ammo_supplier.supply": "%s弹药 +%s",
|
||||||
"item.target.ammo_supplier.creative": "所有弹药 +2147483647",
|
"item.target.ammo_supplier.creative": "所有弹药 +2147483647",
|
||||||
"item.target.he_5_inches": "5寸口径高爆弹",
|
"item.target.he_5_inches": "高爆弹",
|
||||||
|
"item.target.ap_5_inches": "穿甲弹",
|
||||||
|
|
||||||
"item.target.target_deployer": "标靶",
|
"item.target.target_deployer": "标靶",
|
||||||
"item.target.senpai_spawn_egg": "野兽先辈刷怪蛋",
|
"item.target.senpai_spawn_egg": "野兽先辈刷怪蛋",
|
||||||
|
|
|
@ -1519,14 +1519,6 @@
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"mK_42_fire_3p": {
|
|
||||||
"sounds": [
|
|
||||||
{
|
|
||||||
"name": "target:mk_42/mk_42_fire_3p",
|
|
||||||
"stream": false
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"mk_42_far": {
|
"mk_42_far": {
|
||||||
"sounds": [
|
"sounds": [
|
||||||
{
|
{
|
||||||
|
@ -1542,5 +1534,13 @@
|
||||||
"stream": false
|
"stream": false
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
},
|
||||||
|
"mk_42_fire_3p": {
|
||||||
|
"sounds": [
|
||||||
|
{
|
||||||
|
"name": "target:mk_42/mk_42_fire_3p",
|
||||||
|
"stream": false
|
||||||
|
}
|
||||||
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
Add table
Reference in a new issue