回滚武器名称修改
This commit is contained in:
parent
4b5c1a7525
commit
977523ed67
30 changed files with 43 additions and 43 deletions
|
@ -30,24 +30,24 @@ public class TargetModItems {
|
|||
public static final RegistryObject<Item> ABEKIRI = GUNS.register("abekiri", Abekiri::new);
|
||||
public static final RegistryObject<Item> TRACHELIUM = GUNS.register("trachelium", Trachelium::new);
|
||||
public static final RegistryObject<Item> VECTOR = GUNS.register("vector", VectorItem::new);
|
||||
public static final RegistryObject<Item> AK47 = GUNS.register("ak47", AK47Item::new);
|
||||
public static final RegistryObject<Item> AK_47 = GUNS.register("ak_47", AK47Item::new);
|
||||
public static final RegistryObject<Item> SKS = GUNS.register("sks", SksItem::new);
|
||||
public static final RegistryObject<Item> M4 = GUNS.register("m4", M4Item::new);
|
||||
public static final RegistryObject<Item> HK416 = GUNS.register("hk416", Hk416Item::new);
|
||||
public static final RegistryObject<Item> MK14 = GUNS.register("mk14", Mk14Item::new);
|
||||
public static final RegistryObject<Item> M_4 = GUNS.register("m_4", M4Item::new);
|
||||
public static final RegistryObject<Item> HK_416 = GUNS.register("hk_416", Hk416Item::new);
|
||||
public static final RegistryObject<Item> MK_14 = GUNS.register("mk_14", Mk14Item::new);
|
||||
public static final RegistryObject<Item> MARLIN = GUNS.register("marlin", MarlinItem::new);
|
||||
public static final RegistryObject<Item> SVD = GUNS.register("svd", SvdItem::new);
|
||||
public static final RegistryObject<Item> M98B = GUNS.register("m98b", M98bItem::new);
|
||||
public static final RegistryObject<Item> M_98B = GUNS.register("m_98b", M98bItem::new);
|
||||
public static final RegistryObject<Item> SENTINEL = GUNS.register("sentinel", SentinelItem::new);
|
||||
public static final RegistryObject<Item> HUNTING_RIFLE = GUNS.register("hunting_rifle", HuntingRifle::new);
|
||||
public static final RegistryObject<Item> KRABER = GUNS.register("kraber", Kraber::new);
|
||||
public static final RegistryObject<Item> M870 = GUNS.register("m870", M870Item::new);
|
||||
public static final RegistryObject<Item> AA12 = GUNS.register("aa12", Aa12Item::new);
|
||||
public static final RegistryObject<Item> M_870 = GUNS.register("m_870", M870Item::new);
|
||||
public static final RegistryObject<Item> AA_12 = GUNS.register("aa_12", Aa12Item::new);
|
||||
public static final RegistryObject<Item> DEVOTION = GUNS.register("devotion", Devotion::new);
|
||||
public static final RegistryObject<Item> RPK = GUNS.register("rpk", RpkItem::new);
|
||||
public static final RegistryObject<Item> M60 = GUNS.register("m60", M60Item::new);
|
||||
public static final RegistryObject<Item> M_60 = GUNS.register("m_60", M60Item::new);
|
||||
public static final RegistryObject<Item> MINIGUN = GUNS.register("minigun", Minigun::new);
|
||||
public static final RegistryObject<Item> M79 = GUNS.register("m79", M79Item::new);
|
||||
public static final RegistryObject<Item> M_79 = GUNS.register("m_79", M79Item::new);
|
||||
public static final RegistryObject<Item> RPG = GUNS.register("rpg", RpgItem::new);
|
||||
public static final RegistryObject<Item> BOCEK = GUNS.register("bocek", BocekItem::new);
|
||||
|
||||
|
|
|
@ -167,7 +167,7 @@ public class AK47Item extends GunItem implements GeoItem, AnimatedItem {
|
|||
}
|
||||
|
||||
public static ItemStack getGunInstance() {
|
||||
ItemStack stack = new ItemStack(TargetModItems.AK47.get());
|
||||
ItemStack stack = new ItemStack(TargetModItems.AK_47.get());
|
||||
//GunsTool.initGun(stack, TargetModItems.AK_47.getId().getPath());
|
||||
stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag"));
|
||||
return stack;
|
||||
|
|
|
@ -173,7 +173,7 @@ public class Aa12Item extends GunItem implements GeoItem, AnimatedItem {
|
|||
}
|
||||
|
||||
public static ItemStack getGunInstance() {
|
||||
ItemStack stack = new ItemStack(TargetModItems.AA12.get());
|
||||
ItemStack stack = new ItemStack(TargetModItems.AA_12.get());
|
||||
//GunsTool.initGun(stack, TargetModItems.AA_12.getId().getPath());
|
||||
stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag"));
|
||||
return stack;
|
||||
|
|
|
@ -167,7 +167,7 @@ public class Hk416Item extends GunItem implements GeoItem, AnimatedItem {
|
|||
}
|
||||
|
||||
public static ItemStack getGunInstance() {
|
||||
ItemStack stack = new ItemStack(TargetModItems.HK416.get());
|
||||
ItemStack stack = new ItemStack(TargetModItems.HK_416.get());
|
||||
//GunsTool.initGun(stack, TargetModItems.HK_416.getId().getPath());
|
||||
stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag"));
|
||||
return stack;
|
||||
|
|
|
@ -167,7 +167,7 @@ public class M4Item extends GunItem implements GeoItem, AnimatedItem {
|
|||
}
|
||||
|
||||
public static ItemStack getGunInstance() {
|
||||
ItemStack stack = new ItemStack(TargetModItems.M4.get());
|
||||
ItemStack stack = new ItemStack(TargetModItems.M_4.get());
|
||||
//GunsTool.initGun(stack, TargetModItems.M_4.getId().getPath());
|
||||
stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag"));
|
||||
return stack;
|
||||
|
|
|
@ -172,7 +172,7 @@ public class M60Item extends GunItem implements GeoItem, AnimatedItem {
|
|||
}
|
||||
|
||||
public static ItemStack getGunInstance() {
|
||||
ItemStack stack = new ItemStack(TargetModItems.M60.get());
|
||||
ItemStack stack = new ItemStack(TargetModItems.M_60.get());
|
||||
//GunsTool.initGun(stack, TargetModItems.M_60.getId().getPath());
|
||||
stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag"));
|
||||
return stack;
|
||||
|
|
|
@ -172,7 +172,7 @@ public class M79Item extends GunItem implements GeoItem, AnimatedItem {
|
|||
}
|
||||
|
||||
public static ItemStack getGunInstance() {
|
||||
ItemStack stack = new ItemStack(TargetModItems.M79.get());
|
||||
ItemStack stack = new ItemStack(TargetModItems.M_79.get());
|
||||
//GunsTool.initGun(stack, TargetModItems.M_79.getId().getPath());
|
||||
stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag"));
|
||||
return stack;
|
||||
|
|
|
@ -177,7 +177,7 @@ public class M870Item extends GunItem implements GeoItem, AnimatedItem {
|
|||
}
|
||||
|
||||
public static ItemStack getGunInstance() {
|
||||
ItemStack stack = new ItemStack(TargetModItems.M870.get());
|
||||
ItemStack stack = new ItemStack(TargetModItems.M_870.get());
|
||||
//GunsTool.initGun(stack, TargetModItems.M_870.getId().getPath());
|
||||
stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag"));
|
||||
return stack;
|
||||
|
|
|
@ -163,7 +163,7 @@ public class M98bItem extends GunItem implements GeoItem, AnimatedItem {
|
|||
}
|
||||
|
||||
public static ItemStack getGunInstance() {
|
||||
ItemStack stack = new ItemStack(TargetModItems.M98B.get());
|
||||
ItemStack stack = new ItemStack(TargetModItems.M_98B.get());
|
||||
//GunsTool.initGun(stack, TargetModItems.M_98B.getId().getPath());
|
||||
stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag"));
|
||||
return stack;
|
||||
|
|
|
@ -168,7 +168,7 @@ public class Mk14Item extends GunItem implements GeoItem, AnimatedItem {
|
|||
}
|
||||
|
||||
public static ItemStack getGunInstance() {
|
||||
ItemStack stack = new ItemStack(TargetModItems.MK14.get());
|
||||
ItemStack stack = new ItemStack(TargetModItems.MK_14.get());
|
||||
//GunsTool.initGun(stack, TargetModItems.MK_14.getId().getPath());
|
||||
stack.getOrCreateTag().putDouble("ammo", stack.getOrCreateTag().getDouble("mag"));
|
||||
return stack;
|
||||
|
|
|
@ -18,8 +18,8 @@ public class ChangefiremodeProcedure {
|
|||
return;
|
||||
ItemStack usehand = ItemStack.EMPTY;
|
||||
usehand = (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY);
|
||||
if (usehand.getItem() == TargetModItems.AK47.get() || usehand.getItem() == TargetModItems.M4.get() || usehand.getItem() == TargetModItems.AA12.get() || usehand.getItem() == TargetModItems.HK416.get()
|
||||
|| usehand.getItem() == TargetModItems.RPK.get() || usehand.getItem() == TargetModItems.MK14.get()) {
|
||||
if (usehand.getItem() == TargetModItems.AK_47.get() || usehand.getItem() == TargetModItems.M_4.get() || usehand.getItem() == TargetModItems.AA_12.get() || usehand.getItem() == TargetModItems.HK_416.get()
|
||||
|| usehand.getItem() == TargetModItems.RPK.get() || usehand.getItem() == TargetModItems.MK_14.get()) {
|
||||
if (usehand.getOrCreateTag().getDouble("firemode") == 2) {
|
||||
usehand.getOrCreateTag().putDouble("firemode", 0);
|
||||
usehand.getOrCreateTag().putDouble("cg", 10);
|
||||
|
|
|
@ -18,7 +18,7 @@ public class CrosshairXianShiYouXiNeiDieJiaCengProcedure {
|
|||
|| !(entity.getPersistentData().getDouble("zoom_time") < 7)
|
||||
) return false;
|
||||
|
||||
return !(player.getMainHandItem().getItem() == TargetModItems.M79.get())
|
||||
return !(player.getMainHandItem().getItem() == TargetModItems.M_79.get())
|
||||
&& Minecraft.getInstance().options.getCameraType() == CameraType.FIRST_PERSON;
|
||||
}
|
||||
return false;
|
||||
|
|
|
@ -43,7 +43,7 @@ public class DamageReduceProcedure {
|
|||
}
|
||||
if (damagesource.is(DamageTypes.EXPLOSION) || damagesource.is(DamageTypes.PLAYER_EXPLOSION) || damagesource.is(DamageTypes.ARROW)) {
|
||||
stack = (sourceentity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY);
|
||||
if ((sourceentity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.M79.get()
|
||||
if ((sourceentity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.M_79.get()
|
||||
|| (sourceentity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.RPG.get()) {
|
||||
damage = amount;
|
||||
stack.getOrCreateTag().putDouble("damagetotal", (stack.getOrCreateTag().getDouble("damagetotal") + damage));
|
||||
|
|
|
@ -21,7 +21,7 @@ public class M79fireProcedure {
|
|||
if (entity == null) return;
|
||||
if (entity instanceof Player player && !player.isSpectator()) {
|
||||
ItemStack usehand = player.getMainHandItem();
|
||||
if (usehand.getItem() == TargetModItems.M79.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && !(entity instanceof Player _plrCldCheck4 && _plrCldCheck4.getCooldowns().isOnCooldown(usehand.getItem()))
|
||||
if (usehand.getItem() == TargetModItems.M_79.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && !(entity instanceof Player _plrCldCheck4 && _plrCldCheck4.getCooldowns().isOnCooldown(usehand.getItem()))
|
||||
&& usehand.getOrCreateTag().getDouble("ammo") > 0) {
|
||||
entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
|
||||
capability.recoilhorizon = Math.random() < 0.5 ? -1 : 1;
|
||||
|
|
|
@ -12,7 +12,7 @@ public class M79uiXianShiYouXiNeiDieJiaCengProcedure {
|
|||
if (entity == null) return false;
|
||||
if (entity instanceof Player player) {
|
||||
return !player.isSpectator()
|
||||
&& player.getMainHandItem().getItem() == TargetModItems.M79.get()
|
||||
&& player.getMainHandItem().getItem() == TargetModItems.M_79.get()
|
||||
&& Minecraft.getInstance().options.getCameraType() == CameraType.FIRST_PERSON
|
||||
&& !entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables()).zooming;
|
||||
}
|
||||
|
|
|
@ -16,7 +16,7 @@ public class M870fireProcedure {
|
|||
if (usehand.getOrCreateTag().getDouble("reloading") == 1 && usehand.getOrCreateTag().getDouble("prepare") == 0 && usehand.getOrCreateTag().getDouble("ammo") > 0) {
|
||||
usehand.getOrCreateTag().putDouble("forcestop", 1);
|
||||
}
|
||||
if (usehand.getItem() == TargetModItems.M870.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && !(entity instanceof Player _plrCldCheck8 && _plrCldCheck8.getCooldowns().isOnCooldown(usehand.getItem()))
|
||||
if (usehand.getItem() == TargetModItems.M_870.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && !(entity instanceof Player _plrCldCheck8 && _plrCldCheck8.getCooldowns().isOnCooldown(usehand.getItem()))
|
||||
&& usehand.getOrCreateTag().getDouble("ammo") > 0) {
|
||||
for (int index0 = 0; index0 < 12; index0++) {
|
||||
BulletFireNormalProcedure.execute(entity);
|
||||
|
|
|
@ -13,7 +13,7 @@ public class M98bfireProcedure {
|
|||
if (entity == null) return;
|
||||
if (entity instanceof Player player && !player.isSpectator()) {
|
||||
ItemStack usehand = player.getMainHandItem();
|
||||
if (usehand.getItem() == TargetModItems.M98B.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && !(entity instanceof Player _plrCldCheck4 && _plrCldCheck4.getCooldowns().isOnCooldown(usehand.getItem()))
|
||||
if (usehand.getItem() == TargetModItems.M_98B.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && !(entity instanceof Player _plrCldCheck4 && _plrCldCheck4.getCooldowns().isOnCooldown(usehand.getItem()))
|
||||
&& usehand.getOrCreateTag().getDouble("ammo") > 0) {
|
||||
usehand.getOrCreateTag().putDouble("fireanim", 17);
|
||||
BulletFireNormalProcedure.execute(entity);
|
||||
|
|
|
@ -67,7 +67,7 @@ public class NormalMagGunFire {
|
|||
// for (int index0 = 0; index0 < (int) usehand.getOrCreateTag().getDouble("projectileamount"); index0++) {
|
||||
// BulletFireNormalProcedure.execute(entity);
|
||||
// }
|
||||
if (usehand.getItem() == TargetModItems.AK47.get()) {
|
||||
if (usehand.getItem() == TargetModItems.AK_47.get()) {
|
||||
{
|
||||
if (!entity.level().isClientSide() && entity.getServer() != null) {
|
||||
entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4,
|
||||
|
@ -81,7 +81,7 @@ public class NormalMagGunFire {
|
|||
}
|
||||
}
|
||||
}
|
||||
if (usehand.getItem() == TargetModItems.AA12.get()) {
|
||||
if (usehand.getItem() == TargetModItems.AA_12.get()) {
|
||||
{
|
||||
if (!entity.level().isClientSide() && entity.getServer() != null) {
|
||||
entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4,
|
||||
|
@ -109,7 +109,7 @@ public class NormalMagGunFire {
|
|||
}
|
||||
}
|
||||
}
|
||||
if (usehand.getItem() == TargetModItems.HK416.get()) {
|
||||
if (usehand.getItem() == TargetModItems.HK_416.get()) {
|
||||
{
|
||||
if (!entity.level().isClientSide() && entity.getServer() != null) {
|
||||
entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4,
|
||||
|
@ -123,7 +123,7 @@ public class NormalMagGunFire {
|
|||
}
|
||||
}
|
||||
}
|
||||
if (usehand.getItem() == TargetModItems.M4.get()) {
|
||||
if (usehand.getItem() == TargetModItems.M_4.get()) {
|
||||
{
|
||||
if (!entity.level().isClientSide() && entity.getServer() != null) {
|
||||
entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4,
|
||||
|
@ -137,7 +137,7 @@ public class NormalMagGunFire {
|
|||
}
|
||||
}
|
||||
}
|
||||
if (usehand.getItem() == TargetModItems.M60.get()) {
|
||||
if (usehand.getItem() == TargetModItems.M_60.get()) {
|
||||
{
|
||||
if (!entity.level().isClientSide() && entity.getServer() != null) {
|
||||
entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4,
|
||||
|
@ -165,7 +165,7 @@ public class NormalMagGunFire {
|
|||
}
|
||||
}
|
||||
}
|
||||
if (usehand.getItem() == TargetModItems.MK14.get()) {
|
||||
if (usehand.getItem() == TargetModItems.MK_14.get()) {
|
||||
{
|
||||
if (!entity.level().isClientSide() && entity.getServer() != null) {
|
||||
entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4,
|
||||
|
|
|
@ -47,7 +47,7 @@ public class PlayerReloadProcedure {
|
|||
tag.putDouble("emptyreload", 1);
|
||||
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
||||
}
|
||||
if (player.getMainHandItem().getItem() == TargetModItems.M79.get()
|
||||
if (player.getMainHandItem().getItem() == TargetModItems.M_79.get()
|
||||
&& !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem()))
|
||||
&& tag.getDouble("reloading") == 0
|
||||
&& tag.getDouble("ammo") < 1
|
||||
|
@ -84,7 +84,7 @@ public class PlayerReloadProcedure {
|
|||
tag.putDouble("reloadtime", 99);
|
||||
}
|
||||
}
|
||||
if (player.getMainHandItem().getItem() == TargetModItems.M98B.get()
|
||||
if (player.getMainHandItem().getItem() == TargetModItems.M_98B.get()
|
||||
&& !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem()))
|
||||
&& tag.getDouble("reloading") == 0
|
||||
&& tag.getDouble("ammo") < 6
|
||||
|
@ -135,7 +135,7 @@ public class PlayerReloadProcedure {
|
|||
tag.putDouble("reloadtime", 61);
|
||||
}
|
||||
}
|
||||
if (player.getMainHandItem().getItem() == TargetModItems.MK14.get()
|
||||
if (player.getMainHandItem().getItem() == TargetModItems.MK_14.get()
|
||||
&& !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem()))
|
||||
&& tag.getDouble("reloading") == 0
|
||||
&& tag.getDouble("ammo") < 21
|
||||
|
@ -169,7 +169,7 @@ public class PlayerReloadProcedure {
|
|||
tag.putDouble("reloadtime", 57);
|
||||
}
|
||||
}
|
||||
if (player.getMainHandItem().getItem() == TargetModItems.AK47.get()
|
||||
if (player.getMainHandItem().getItem() == TargetModItems.AK_47.get()
|
||||
&& !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem()))
|
||||
&& tag.getDouble("reloading") == 0
|
||||
&& tag.getDouble("ammo") < 31
|
||||
|
@ -186,8 +186,8 @@ public class PlayerReloadProcedure {
|
|||
tag.putDouble("reloadtime", 57);
|
||||
}
|
||||
}
|
||||
if ((player.getMainHandItem().getItem() == TargetModItems.M4.get()
|
||||
|| player.getMainHandItem().getItem() == TargetModItems.HK416.get())
|
||||
if ((player.getMainHandItem().getItem() == TargetModItems.M_4.get()
|
||||
|| player.getMainHandItem().getItem() == TargetModItems.HK_416.get())
|
||||
&& !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem()))
|
||||
&& tag.getDouble("reloading") == 0
|
||||
&& tag.getDouble("ammo") < 31
|
||||
|
@ -204,7 +204,7 @@ public class PlayerReloadProcedure {
|
|||
tag.putDouble("reloadtime", 55);
|
||||
}
|
||||
}
|
||||
if (player.getMainHandItem().getItem() == TargetModItems.AA12.get()
|
||||
if (player.getMainHandItem().getItem() == TargetModItems.AA_12.get()
|
||||
&& !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem()))
|
||||
&& tag.getDouble("reloading") == 0
|
||||
&& tag.getDouble("ammo") < 26
|
||||
|
@ -289,7 +289,7 @@ public class PlayerReloadProcedure {
|
|||
tag.putDouble("reloadtime", 57);
|
||||
}
|
||||
}
|
||||
if (player.getMainHandItem().getItem() == TargetModItems.M60.get()
|
||||
if (player.getMainHandItem().getItem() == TargetModItems.M_60.get()
|
||||
&& !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem()))
|
||||
&& tag.getDouble("reloading") == 0
|
||||
&& (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleammo > 0
|
||||
|
@ -320,7 +320,7 @@ public class PlayerReloadProcedure {
|
|||
entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:marlin_start player @s ~ ~ ~ 100 1");
|
||||
}
|
||||
}
|
||||
if (player.getMainHandItem().getItem() == TargetModItems.M870.get()
|
||||
if (player.getMainHandItem().getItem() == TargetModItems.M_870.get()
|
||||
&& !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem()))
|
||||
&& tag.getDouble("reloading") == 0
|
||||
&& tag.getDouble("ammo") < 8
|
||||
|
|
|
@ -164,7 +164,7 @@ public class ReloadsoundstopProcedure {
|
|||
}
|
||||
}
|
||||
}
|
||||
if (!((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.M870.get())) {
|
||||
if (!((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.M_870.get())) {
|
||||
{
|
||||
Entity _ent = entity;
|
||||
if (!_ent.level().isClientSide() && _ent.getServer() != null) {
|
||||
|
|
|
@ -29,7 +29,7 @@ public class WeapondrawhaveyProcedure {
|
|||
}
|
||||
if (entity instanceof Player _player)
|
||||
_player.getCooldowns().addCooldown(itemstack.getItem(), 32);
|
||||
if (itemstack.getItem() == TargetModItems.M60.get() && itemstack.getOrCreateTag().getDouble("ammo") <= 5) {
|
||||
if (itemstack.getItem() == TargetModItems.M_60.get() && itemstack.getOrCreateTag().getDouble("ammo") <= 5) {
|
||||
itemstack.getOrCreateTag().putDouble("empty", 1);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue