修改大量变量类型,规范化标签命名
This commit is contained in:
parent
b312465fdd
commit
12745e45a4
97 changed files with 952 additions and 964 deletions
|
@ -21,7 +21,7 @@ public class RenderHandler {
|
||||||
|
|
||||||
ItemStack stack = player.getMainHandItem();
|
ItemStack stack = player.getMainHandItem();
|
||||||
|
|
||||||
double p = player.getPersistentData().getDouble("zoompos");
|
double p = player.getPersistentData().getDouble("zoom_pos");
|
||||||
double zoom = stack.getOrCreateTag().getDouble("zoom");
|
double zoom = stack.getOrCreateTag().getDouble("zoom");
|
||||||
|
|
||||||
if (stack.is(TargetModTags.Items.GUN)) {
|
if (stack.is(TargetModTags.Items.GUN)) {
|
||||||
|
|
|
@ -37,10 +37,10 @@ public class AK47ItemModel extends GeoModel<AK47Item> {
|
||||||
ItemStack stack = player.getMainHandItem();
|
ItemStack stack = player.getMainHandItem();
|
||||||
|
|
||||||
double p = 0;
|
double p = 0;
|
||||||
p = player.getPersistentData().getDouble("zoompos");
|
p = player.getPersistentData().getDouble("zoom_pos");
|
||||||
|
|
||||||
double zp = 0;
|
double zp = 0;
|
||||||
zp = player.getPersistentData().getDouble("zoomposz");
|
zp = player.getPersistentData().getDouble("zoom_pos_z");
|
||||||
|
|
||||||
gun.setPosX(2.11f * (float) p);
|
gun.setPosX(2.11f * (float) p);
|
||||||
|
|
||||||
|
@ -65,7 +65,7 @@ public class AK47ItemModel extends GeoModel<AK47Item> {
|
||||||
}
|
}
|
||||||
|
|
||||||
double fp = 0;
|
double fp = 0;
|
||||||
fp = player.getPersistentData().getDouble("firepos");
|
fp = player.getPersistentData().getDouble("fire_pos");
|
||||||
|
|
||||||
|
|
||||||
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
|
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
|
||||||
|
@ -117,7 +117,7 @@ public class AK47ItemModel extends GeoModel<AK47Item> {
|
||||||
yaw = player.getPersistentData().getDouble("yaw");
|
yaw = player.getPersistentData().getDouble("yaw");
|
||||||
|
|
||||||
double pit = 0;
|
double pit = 0;
|
||||||
pit = player.getPersistentData().getDouble("gunpitch");
|
pit = player.getPersistentData().getDouble("gun_pitch");
|
||||||
|
|
||||||
double vy = 0;
|
double vy = 0;
|
||||||
vy = player.getPersistentData().getDouble("vy");
|
vy = player.getPersistentData().getDouble("vy");
|
||||||
|
|
|
@ -34,10 +34,10 @@ public class Aa12ItemModel extends GeoModel<Aa12Item> {
|
||||||
ItemStack stack = player.getMainHandItem();
|
ItemStack stack = player.getMainHandItem();
|
||||||
|
|
||||||
double p = 0;
|
double p = 0;
|
||||||
p = player.getPersistentData().getDouble("zoompos");
|
p = player.getPersistentData().getDouble("zoom_pos");
|
||||||
|
|
||||||
double zp = 0;
|
double zp = 0;
|
||||||
zp = player.getPersistentData().getDouble("zoomposz");
|
zp = player.getPersistentData().getDouble("zoom_pos_z");
|
||||||
|
|
||||||
gun.setPosX(8.863f * (float) p);
|
gun.setPosX(8.863f * (float) p);
|
||||||
|
|
||||||
|
@ -50,7 +50,7 @@ public class Aa12ItemModel extends GeoModel<Aa12Item> {
|
||||||
gun.setScaleZ(1f - (0.4f * (float) p));
|
gun.setScaleZ(1f - (0.4f * (float) p));
|
||||||
|
|
||||||
double fp = 0;
|
double fp = 0;
|
||||||
fp = player.getPersistentData().getDouble("firepos");
|
fp = player.getPersistentData().getDouble("fire_pos");
|
||||||
|
|
||||||
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
|
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
|
||||||
shen.setPosZ(5f * (float) fp);
|
shen.setPosZ(5f * (float) fp);
|
||||||
|
@ -101,7 +101,7 @@ public class Aa12ItemModel extends GeoModel<Aa12Item> {
|
||||||
yaw = player.getPersistentData().getDouble("yaw");
|
yaw = player.getPersistentData().getDouble("yaw");
|
||||||
|
|
||||||
double pit = 0;
|
double pit = 0;
|
||||||
pit = player.getPersistentData().getDouble("gunpitch");
|
pit = player.getPersistentData().getDouble("gun_pitch");
|
||||||
|
|
||||||
double vy = 0;
|
double vy = 0;
|
||||||
vy = player.getPersistentData().getDouble("vy");
|
vy = player.getPersistentData().getDouble("vy");
|
||||||
|
|
|
@ -36,10 +36,10 @@ public class AbekiriItemModel extends GeoModel<Abekiri> {
|
||||||
ItemStack stack = player.getMainHandItem();
|
ItemStack stack = player.getMainHandItem();
|
||||||
|
|
||||||
double p = 0;
|
double p = 0;
|
||||||
p = player.getPersistentData().getDouble("zoompos");
|
p = player.getPersistentData().getDouble("zoom_pos");
|
||||||
|
|
||||||
double zp = 0;
|
double zp = 0;
|
||||||
zp = player.getPersistentData().getDouble("zoomposz");
|
zp = player.getPersistentData().getDouble("zoom_pos_z");
|
||||||
|
|
||||||
gun.setPosX(2.5f * (float) p);
|
gun.setPosX(2.5f * (float) p);
|
||||||
|
|
||||||
|
@ -50,7 +50,7 @@ public class AbekiriItemModel extends GeoModel<Abekiri> {
|
||||||
gun.setRotZ((float) (0.05f * zp));
|
gun.setRotZ((float) (0.05f * zp));
|
||||||
|
|
||||||
double fp = 0;
|
double fp = 0;
|
||||||
fp = player.getPersistentData().getDouble("firepos");
|
fp = player.getPersistentData().getDouble("fire_pos");
|
||||||
|
|
||||||
shen.setPosZ(4f * (float) fp);
|
shen.setPosZ(4f * (float) fp);
|
||||||
|
|
||||||
|
@ -93,7 +93,7 @@ public class AbekiriItemModel extends GeoModel<Abekiri> {
|
||||||
yaw = player.getPersistentData().getDouble("yaw");
|
yaw = player.getPersistentData().getDouble("yaw");
|
||||||
|
|
||||||
double pit = 0;
|
double pit = 0;
|
||||||
pit = player.getPersistentData().getDouble("gunpitch");
|
pit = player.getPersistentData().getDouble("gun_pitch");
|
||||||
|
|
||||||
double vy = 0;
|
double vy = 0;
|
||||||
vy = player.getPersistentData().getDouble("vy");
|
vy = player.getPersistentData().getDouble("vy");
|
||||||
|
|
|
@ -45,7 +45,7 @@ public class BocekItemModel extends GeoModel<BocekItem> {
|
||||||
Player player = Minecraft.getInstance().player;
|
Player player = Minecraft.getInstance().player;
|
||||||
ItemStack stack = player.getMainHandItem();
|
ItemStack stack = player.getMainHandItem();
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("arrowempty") > 0) {
|
if (stack.getOrCreateTag().getInt("arrow_empty") > 0) {
|
||||||
arrow.setScaleX(0);
|
arrow.setScaleX(0);
|
||||||
arrow.setScaleY(0);
|
arrow.setScaleY(0);
|
||||||
arrow.setScaleZ(0);
|
arrow.setScaleZ(0);
|
||||||
|
@ -96,10 +96,10 @@ public class BocekItemModel extends GeoModel<BocekItem> {
|
||||||
}
|
}
|
||||||
|
|
||||||
double p = 0;
|
double p = 0;
|
||||||
p = player.getPersistentData().getDouble("zoompos");
|
p = player.getPersistentData().getDouble("zoom_pos");
|
||||||
|
|
||||||
double zp = 0;
|
double zp = 0;
|
||||||
zp = player.getPersistentData().getDouble("zoomposz");
|
zp = player.getPersistentData().getDouble("zoom_pos_z");
|
||||||
|
|
||||||
shen.setPosX(3.08f * (float) p);
|
shen.setPosX(3.08f * (float) p);
|
||||||
|
|
||||||
|
@ -113,7 +113,7 @@ public class BocekItemModel extends GeoModel<BocekItem> {
|
||||||
double FireRotX = 0;
|
double FireRotX = 0;
|
||||||
|
|
||||||
double fp = 0;
|
double fp = 0;
|
||||||
fp = player.getPersistentData().getDouble("firepos");
|
fp = player.getPersistentData().getDouble("fire_pos");
|
||||||
|
|
||||||
fire.setPosZ(4f * (float) fp);
|
fire.setPosZ(4f * (float) fp);
|
||||||
|
|
||||||
|
@ -144,7 +144,7 @@ public class BocekItemModel extends GeoModel<BocekItem> {
|
||||||
yaw = player.getPersistentData().getDouble("yaw");
|
yaw = player.getPersistentData().getDouble("yaw");
|
||||||
|
|
||||||
double pit = 0;
|
double pit = 0;
|
||||||
pit = player.getPersistentData().getDouble("gunpitch");
|
pit = player.getPersistentData().getDouble("gun_pitch");
|
||||||
|
|
||||||
double vy = 0;
|
double vy = 0;
|
||||||
vy = player.getPersistentData().getDouble("vy");
|
vy = player.getPersistentData().getDouble("vy");
|
||||||
|
|
|
@ -38,10 +38,10 @@ public class DevotionItemModel extends GeoModel<Devotion> {
|
||||||
ItemStack stack = player.getMainHandItem();
|
ItemStack stack = player.getMainHandItem();
|
||||||
|
|
||||||
double p = 0;
|
double p = 0;
|
||||||
p = player.getPersistentData().getDouble("zoompos");
|
p = player.getPersistentData().getDouble("zoom_pos");
|
||||||
|
|
||||||
double zp = 0;
|
double zp = 0;
|
||||||
zp = player.getPersistentData().getDouble("zoomposz");
|
zp = player.getPersistentData().getDouble("zoom_pos_z");
|
||||||
|
|
||||||
gun.setPosX(2.19f * (float) p);
|
gun.setPosX(2.19f * (float) p);
|
||||||
|
|
||||||
|
@ -57,7 +57,7 @@ public class DevotionItemModel extends GeoModel<Devotion> {
|
||||||
CoreGeoBone number = getAnimationProcessor().getBone("number");
|
CoreGeoBone number = getAnimationProcessor().getBone("number");
|
||||||
|
|
||||||
double fp = 0;
|
double fp = 0;
|
||||||
fp = player.getPersistentData().getDouble("firepos");
|
fp = player.getPersistentData().getDouble("fire_pos");
|
||||||
|
|
||||||
double bp = 0;
|
double bp = 0;
|
||||||
bp = player.getPersistentData().getDouble("boltpos");
|
bp = player.getPersistentData().getDouble("boltpos");
|
||||||
|
@ -645,7 +645,7 @@ public class DevotionItemModel extends GeoModel<Devotion> {
|
||||||
yaw = player.getPersistentData().getDouble("yaw");
|
yaw = player.getPersistentData().getDouble("yaw");
|
||||||
|
|
||||||
double pit = 0;
|
double pit = 0;
|
||||||
pit = player.getPersistentData().getDouble("gunpitch");
|
pit = player.getPersistentData().getDouble("gun_pitch");
|
||||||
|
|
||||||
double vy = 0;
|
double vy = 0;
|
||||||
vy = player.getPersistentData().getDouble("vy");
|
vy = player.getPersistentData().getDouble("vy");
|
||||||
|
|
|
@ -48,10 +48,10 @@ public class Hk416ItemModel extends GeoModel<Hk416Item> {
|
||||||
}
|
}
|
||||||
|
|
||||||
double p = 0;
|
double p = 0;
|
||||||
p = player.getPersistentData().getDouble("zoompos");
|
p = player.getPersistentData().getDouble("zoom_pos");
|
||||||
|
|
||||||
double zp = 0;
|
double zp = 0;
|
||||||
zp = player.getPersistentData().getDouble("zoomposz");
|
zp = player.getPersistentData().getDouble("zoom_pos_z");
|
||||||
|
|
||||||
gun.setPosX(3.28f * (float) p);
|
gun.setPosX(3.28f * (float) p);
|
||||||
|
|
||||||
|
@ -73,7 +73,7 @@ public class Hk416ItemModel extends GeoModel<Hk416Item> {
|
||||||
}
|
}
|
||||||
|
|
||||||
double fp = 0;
|
double fp = 0;
|
||||||
fp = player.getPersistentData().getDouble("firepos");
|
fp = player.getPersistentData().getDouble("fire_pos");
|
||||||
|
|
||||||
shen.setPosZ(0.8f * (float) fp);
|
shen.setPosZ(0.8f * (float) fp);
|
||||||
|
|
||||||
|
@ -108,7 +108,7 @@ public class Hk416ItemModel extends GeoModel<Hk416Item> {
|
||||||
yaw = player.getPersistentData().getDouble("yaw");
|
yaw = player.getPersistentData().getDouble("yaw");
|
||||||
|
|
||||||
double pit = 0;
|
double pit = 0;
|
||||||
pit = player.getPersistentData().getDouble("gunpitch");
|
pit = player.getPersistentData().getDouble("gun_pitch");
|
||||||
|
|
||||||
double vy = 0;
|
double vy = 0;
|
||||||
vy = player.getPersistentData().getDouble("vy");
|
vy = player.getPersistentData().getDouble("vy");
|
||||||
|
|
|
@ -35,10 +35,10 @@ public class HuntingRifleItemModel extends GeoModel<HuntingRifle> {
|
||||||
ItemStack stack = player.getMainHandItem();
|
ItemStack stack = player.getMainHandItem();
|
||||||
|
|
||||||
double p = 0;
|
double p = 0;
|
||||||
p = player.getPersistentData().getDouble("zoompos");
|
p = player.getPersistentData().getDouble("zoom_pos");
|
||||||
|
|
||||||
double zp = 0;
|
double zp = 0;
|
||||||
zp = player.getPersistentData().getDouble("zoomposz");
|
zp = player.getPersistentData().getDouble("zoom_pos_z");
|
||||||
|
|
||||||
gun.setPosX(2.74f * (float) p);
|
gun.setPosX(2.74f * (float) p);
|
||||||
|
|
||||||
|
@ -51,7 +51,7 @@ public class HuntingRifleItemModel extends GeoModel<HuntingRifle> {
|
||||||
gun.setScaleZ(1f - (0.1f * (float) p));
|
gun.setScaleZ(1f - (0.1f * (float) p));
|
||||||
|
|
||||||
double fp = 0;
|
double fp = 0;
|
||||||
fp = player.getPersistentData().getDouble("firepos");
|
fp = player.getPersistentData().getDouble("fire_pos");
|
||||||
|
|
||||||
shen.setPosZ(4f * (float) fp);
|
shen.setPosZ(4f * (float) fp);
|
||||||
|
|
||||||
|
@ -100,7 +100,7 @@ public class HuntingRifleItemModel extends GeoModel<HuntingRifle> {
|
||||||
yaw = player.getPersistentData().getDouble("yaw");
|
yaw = player.getPersistentData().getDouble("yaw");
|
||||||
|
|
||||||
double pit = 0;
|
double pit = 0;
|
||||||
pit = player.getPersistentData().getDouble("gunpitch");
|
pit = player.getPersistentData().getDouble("gun_pitch");
|
||||||
|
|
||||||
double vy = 0;
|
double vy = 0;
|
||||||
vy = player.getPersistentData().getDouble("vy");
|
vy = player.getPersistentData().getDouble("vy");
|
||||||
|
|
|
@ -44,7 +44,7 @@ public class KraberItemModel extends GeoModel<Kraber> {
|
||||||
}
|
}
|
||||||
|
|
||||||
double fp = 0;
|
double fp = 0;
|
||||||
fp = player.getPersistentData().getDouble("firepos");
|
fp = player.getPersistentData().getDouble("fire_pos");
|
||||||
|
|
||||||
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
|
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
|
||||||
shen.setPosZ(3f * (float) fp);
|
shen.setPosZ(3f * (float) fp);
|
||||||
|
@ -67,10 +67,10 @@ public class KraberItemModel extends GeoModel<Kraber> {
|
||||||
}
|
}
|
||||||
|
|
||||||
double p = 0;
|
double p = 0;
|
||||||
p = player.getPersistentData().getDouble("zoompos");
|
p = player.getPersistentData().getDouble("zoom_pos");
|
||||||
|
|
||||||
double zp = 0;
|
double zp = 0;
|
||||||
zp = player.getPersistentData().getDouble("zoomposz");
|
zp = player.getPersistentData().getDouble("zoom_pos_z");
|
||||||
|
|
||||||
gun.setPosX(6.298f * (float) p);
|
gun.setPosX(6.298f * (float) p);
|
||||||
|
|
||||||
|
@ -113,7 +113,7 @@ public class KraberItemModel extends GeoModel<Kraber> {
|
||||||
yaw = player.getPersistentData().getDouble("yaw");
|
yaw = player.getPersistentData().getDouble("yaw");
|
||||||
|
|
||||||
double pit = 0;
|
double pit = 0;
|
||||||
pit = player.getPersistentData().getDouble("gunpitch");
|
pit = player.getPersistentData().getDouble("gun_pitch");
|
||||||
|
|
||||||
double vy = 0;
|
double vy = 0;
|
||||||
vy = player.getPersistentData().getDouble("vy");
|
vy = player.getPersistentData().getDouble("vy");
|
||||||
|
|
|
@ -35,10 +35,10 @@ public class M4ItemModel extends GeoModel<M4Item> {
|
||||||
ItemStack stack = player.getMainHandItem();
|
ItemStack stack = player.getMainHandItem();
|
||||||
|
|
||||||
double p = 0;
|
double p = 0;
|
||||||
p = player.getPersistentData().getDouble("zoompos");
|
p = player.getPersistentData().getDouble("zoom_pos");
|
||||||
|
|
||||||
double zp = 0;
|
double zp = 0;
|
||||||
zp = player.getPersistentData().getDouble("zoomposz");
|
zp = player.getPersistentData().getDouble("zoom_pos_z");
|
||||||
|
|
||||||
gun.setPosX(2.935f * (float) p);
|
gun.setPosX(2.935f * (float) p);
|
||||||
|
|
||||||
|
@ -51,7 +51,7 @@ public class M4ItemModel extends GeoModel<M4Item> {
|
||||||
gun.setRotZ((float) (0.05f * zp));
|
gun.setRotZ((float) (0.05f * zp));
|
||||||
|
|
||||||
double fp = 0;
|
double fp = 0;
|
||||||
fp = player.getPersistentData().getDouble("firepos");
|
fp = player.getPersistentData().getDouble("fire_pos");
|
||||||
|
|
||||||
shen.setPosZ(0.85f * (float) fp);
|
shen.setPosZ(0.85f * (float) fp);
|
||||||
|
|
||||||
|
@ -98,7 +98,7 @@ public class M4ItemModel extends GeoModel<M4Item> {
|
||||||
yaw = player.getPersistentData().getDouble("yaw");
|
yaw = player.getPersistentData().getDouble("yaw");
|
||||||
|
|
||||||
double pit = 0;
|
double pit = 0;
|
||||||
pit = player.getPersistentData().getDouble("gunpitch");
|
pit = player.getPersistentData().getDouble("gun_pitch");
|
||||||
|
|
||||||
double vy = 0;
|
double vy = 0;
|
||||||
vy = player.getPersistentData().getDouble("vy");
|
vy = player.getPersistentData().getDouble("vy");
|
||||||
|
|
|
@ -78,10 +78,10 @@ public class M60ItemModel extends GeoModel<M60Item> {
|
||||||
}
|
}
|
||||||
|
|
||||||
double p = 0;
|
double p = 0;
|
||||||
p = player.getPersistentData().getDouble("zoompos");
|
p = player.getPersistentData().getDouble("zoom_pos");
|
||||||
|
|
||||||
double zp = 0;
|
double zp = 0;
|
||||||
zp = player.getPersistentData().getDouble("zoomposz");
|
zp = player.getPersistentData().getDouble("zoom_pos_z");
|
||||||
|
|
||||||
gun.setPosX(3.69f * (float) p);
|
gun.setPosX(3.69f * (float) p);
|
||||||
|
|
||||||
|
@ -92,7 +92,7 @@ public class M60ItemModel extends GeoModel<M60Item> {
|
||||||
gun.setRotZ(-0.087f * (float) p + (float) (0.05f * zp));
|
gun.setRotZ(-0.087f * (float) p + (float) (0.05f * zp));
|
||||||
|
|
||||||
double fp = 0;
|
double fp = 0;
|
||||||
fp = player.getPersistentData().getDouble("firepos");
|
fp = player.getPersistentData().getDouble("fire_pos");
|
||||||
|
|
||||||
shen.setPosZ(1.25f * (float) fp);
|
shen.setPosZ(1.25f * (float) fp);
|
||||||
|
|
||||||
|
@ -141,7 +141,7 @@ public class M60ItemModel extends GeoModel<M60Item> {
|
||||||
yaw = player.getPersistentData().getDouble("yaw");
|
yaw = player.getPersistentData().getDouble("yaw");
|
||||||
|
|
||||||
double pit = 0;
|
double pit = 0;
|
||||||
pit = player.getPersistentData().getDouble("gunpitch");
|
pit = player.getPersistentData().getDouble("gun_pitch");
|
||||||
|
|
||||||
double vy = 0;
|
double vy = 0;
|
||||||
vy = player.getPersistentData().getDouble("vy");
|
vy = player.getPersistentData().getDouble("vy");
|
||||||
|
|
|
@ -35,10 +35,10 @@ public class M79ItemModel extends GeoModel<M79Item> {
|
||||||
ItemStack stack = player.getMainHandItem();
|
ItemStack stack = player.getMainHandItem();
|
||||||
|
|
||||||
double p = 0;
|
double p = 0;
|
||||||
p = player.getPersistentData().getDouble("zoompos");
|
p = player.getPersistentData().getDouble("zoom_pos");
|
||||||
|
|
||||||
double zp = 0;
|
double zp = 0;
|
||||||
zp = player.getPersistentData().getDouble("zoomposz");
|
zp = player.getPersistentData().getDouble("zoom_pos_z");
|
||||||
|
|
||||||
gun.setPosX(2.2f * (float) p);
|
gun.setPosX(2.2f * (float) p);
|
||||||
|
|
||||||
|
@ -50,7 +50,7 @@ public class M79ItemModel extends GeoModel<M79Item> {
|
||||||
|
|
||||||
CoreGeoBone flare = getAnimationProcessor().getBone("flare");
|
CoreGeoBone flare = getAnimationProcessor().getBone("flare");
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("fireanim") > 0) {
|
if (stack.getOrCreateTag().getInt("fire_animation") > 0) {
|
||||||
flare.setScaleX((float) (1.0 + 0.5 * (Math.random() - 0.5)));
|
flare.setScaleX((float) (1.0 + 0.5 * (Math.random() - 0.5)));
|
||||||
flare.setScaleY((float) (1.0 + 0.5 * (Math.random() - 0.5)));
|
flare.setScaleY((float) (1.0 + 0.5 * (Math.random() - 0.5)));
|
||||||
flare.setRotZ((float) (0.5 * (Math.random() - 0.5)));
|
flare.setRotZ((float) (0.5 * (Math.random() - 0.5)));
|
||||||
|
@ -61,7 +61,7 @@ public class M79ItemModel extends GeoModel<M79Item> {
|
||||||
}
|
}
|
||||||
|
|
||||||
double fp = 0;
|
double fp = 0;
|
||||||
fp = player.getPersistentData().getDouble("firepos");
|
fp = player.getPersistentData().getDouble("fire_pos");
|
||||||
|
|
||||||
shen.setPosZ(4f * (float) fp);
|
shen.setPosZ(4f * (float) fp);
|
||||||
|
|
||||||
|
@ -92,7 +92,7 @@ public class M79ItemModel extends GeoModel<M79Item> {
|
||||||
yaw = player.getPersistentData().getDouble("yaw");
|
yaw = player.getPersistentData().getDouble("yaw");
|
||||||
|
|
||||||
double pit = 0;
|
double pit = 0;
|
||||||
pit = player.getPersistentData().getDouble("gunpitch");
|
pit = player.getPersistentData().getDouble("gun_pitch");
|
||||||
|
|
||||||
double vy = 0;
|
double vy = 0;
|
||||||
vy = player.getPersistentData().getDouble("vy");
|
vy = player.getPersistentData().getDouble("vy");
|
||||||
|
|
|
@ -35,7 +35,7 @@ public class M870ItemModel extends GeoModel<M870Item> {
|
||||||
Player player = Minecraft.getInstance().player;
|
Player player = Minecraft.getInstance().player;
|
||||||
ItemStack stack = player.getMainHandItem();
|
ItemStack stack = player.getMainHandItem();
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("reloading") == 1) {
|
if (stack.getOrCreateTag().getBoolean("reloading")) {
|
||||||
if (stack.getOrCreateTag().getDouble("prepare") == 0) {
|
if (stack.getOrCreateTag().getDouble("prepare") == 0) {
|
||||||
if (stack.getOrCreateTag().getDouble("loading") > 10 || stack.getOrCreateTag().getDouble("loading") < 2) {
|
if (stack.getOrCreateTag().getDouble("loading") > 10 || stack.getOrCreateTag().getDouble("loading") < 2) {
|
||||||
shell.setScaleX(0);
|
shell.setScaleX(0);
|
||||||
|
@ -46,10 +46,10 @@ public class M870ItemModel extends GeoModel<M870Item> {
|
||||||
}
|
}
|
||||||
|
|
||||||
double p = 0;
|
double p = 0;
|
||||||
p = player.getPersistentData().getDouble("zoompos");
|
p = player.getPersistentData().getDouble("zoom_pos");
|
||||||
|
|
||||||
double zp = 0;
|
double zp = 0;
|
||||||
zp = player.getPersistentData().getDouble("zoomposz");
|
zp = player.getPersistentData().getDouble("zoom_pos_z");
|
||||||
|
|
||||||
gun.setPosX(5.22f * (float) p);
|
gun.setPosX(5.22f * (float) p);
|
||||||
|
|
||||||
|
@ -62,7 +62,7 @@ public class M870ItemModel extends GeoModel<M870Item> {
|
||||||
gun.setScaleZ(1f - (0.2f * (float) p));
|
gun.setScaleZ(1f - (0.2f * (float) p));
|
||||||
|
|
||||||
double fp = 0;
|
double fp = 0;
|
||||||
fp = player.getPersistentData().getDouble("firepos");
|
fp = player.getPersistentData().getDouble("fire_pos");
|
||||||
|
|
||||||
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
|
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
|
||||||
shen.setPosZ(3f * (float) fp);
|
shen.setPosZ(3f * (float) fp);
|
||||||
|
@ -90,7 +90,7 @@ public class M870ItemModel extends GeoModel<M870Item> {
|
||||||
|
|
||||||
CoreGeoBone flare = getAnimationProcessor().getBone("flare");
|
CoreGeoBone flare = getAnimationProcessor().getBone("flare");
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("fireanim") > 0) {
|
if (stack.getOrCreateTag().getInt("fire_animation") > 0) {
|
||||||
flare.setScaleX((float) (1.0 + 0.5 * (Math.random() - 0.5)));
|
flare.setScaleX((float) (1.0 + 0.5 * (Math.random() - 0.5)));
|
||||||
flare.setScaleY((float) (1.0 + 0.5 * (Math.random() - 0.5)));
|
flare.setScaleY((float) (1.0 + 0.5 * (Math.random() - 0.5)));
|
||||||
flare.setRotZ((float) (0.5 * (Math.random() - 0.5)));
|
flare.setRotZ((float) (0.5 * (Math.random() - 0.5)));
|
||||||
|
@ -119,7 +119,7 @@ public class M870ItemModel extends GeoModel<M870Item> {
|
||||||
yaw = player.getPersistentData().getDouble("yaw");
|
yaw = player.getPersistentData().getDouble("yaw");
|
||||||
|
|
||||||
double pit = 0;
|
double pit = 0;
|
||||||
pit = player.getPersistentData().getDouble("gunpitch");
|
pit = player.getPersistentData().getDouble("gun_pitch");
|
||||||
|
|
||||||
double vy = 0;
|
double vy = 0;
|
||||||
vy = player.getPersistentData().getDouble("vy");
|
vy = player.getPersistentData().getDouble("vy");
|
||||||
|
|
|
@ -36,7 +36,7 @@ public class M98bItemModel extends GeoModel<M98bItem> {
|
||||||
ItemStack stack = player.getMainHandItem();
|
ItemStack stack = player.getMainHandItem();
|
||||||
|
|
||||||
double fp = 0;
|
double fp = 0;
|
||||||
fp = player.getPersistentData().getDouble("firepos");
|
fp = player.getPersistentData().getDouble("fire_pos");
|
||||||
|
|
||||||
shen.setPosZ(3f * (float) fp);
|
shen.setPosZ(3f * (float) fp);
|
||||||
|
|
||||||
|
@ -57,10 +57,10 @@ public class M98bItemModel extends GeoModel<M98bItem> {
|
||||||
}
|
}
|
||||||
|
|
||||||
double p = 0;
|
double p = 0;
|
||||||
p = player.getPersistentData().getDouble("zoompos");
|
p = player.getPersistentData().getDouble("zoom_pos");
|
||||||
|
|
||||||
double zp = 0;
|
double zp = 0;
|
||||||
zp = player.getPersistentData().getDouble("zoomposz");
|
zp = player.getPersistentData().getDouble("zoom_pos_z");
|
||||||
|
|
||||||
gun.setPosX(2.245f * (float) p);
|
gun.setPosX(2.245f * (float) p);
|
||||||
|
|
||||||
|
@ -114,7 +114,7 @@ public class M98bItemModel extends GeoModel<M98bItem> {
|
||||||
yaw = player.getPersistentData().getDouble("yaw");
|
yaw = player.getPersistentData().getDouble("yaw");
|
||||||
|
|
||||||
double pit = 0;
|
double pit = 0;
|
||||||
pit = player.getPersistentData().getDouble("gunpitch");
|
pit = player.getPersistentData().getDouble("gun_pitch");
|
||||||
|
|
||||||
double vy = 0;
|
double vy = 0;
|
||||||
vy = player.getPersistentData().getDouble("vy");
|
vy = player.getPersistentData().getDouble("vy");
|
||||||
|
|
|
@ -35,10 +35,10 @@ public class MarlinItemModel extends GeoModel<MarlinItem> {
|
||||||
ItemStack stack = player.getMainHandItem();
|
ItemStack stack = player.getMainHandItem();
|
||||||
|
|
||||||
double p = 0;
|
double p = 0;
|
||||||
p = player.getPersistentData().getDouble("zoompos");
|
p = player.getPersistentData().getDouble("zoom_pos");
|
||||||
|
|
||||||
double zp = 0;
|
double zp = 0;
|
||||||
zp = player.getPersistentData().getDouble("zoomposz");
|
zp = player.getPersistentData().getDouble("zoom_pos_z");
|
||||||
|
|
||||||
gun.setPosX(5.235f * (float) p);
|
gun.setPosX(5.235f * (float) p);
|
||||||
|
|
||||||
|
@ -51,7 +51,7 @@ public class MarlinItemModel extends GeoModel<MarlinItem> {
|
||||||
gun.setScaleZ(1f - (0.2f * (float) p));
|
gun.setScaleZ(1f - (0.2f * (float) p));
|
||||||
|
|
||||||
double fp = 0;
|
double fp = 0;
|
||||||
fp = player.getPersistentData().getDouble("firepos");
|
fp = player.getPersistentData().getDouble("fire_pos");
|
||||||
|
|
||||||
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
|
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
|
||||||
shen.setPosZ(3f * (float) fp);
|
shen.setPosZ(3f * (float) fp);
|
||||||
|
@ -79,7 +79,7 @@ public class MarlinItemModel extends GeoModel<MarlinItem> {
|
||||||
|
|
||||||
CoreGeoBone flare = getAnimationProcessor().getBone("flare");
|
CoreGeoBone flare = getAnimationProcessor().getBone("flare");
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("fireanim") > 0) {
|
if (stack.getOrCreateTag().getInt("fire_animation") > 0) {
|
||||||
flare.setScaleX((float) (1.0 + 0.5 * (Math.random() - 0.5)));
|
flare.setScaleX((float) (1.0 + 0.5 * (Math.random() - 0.5)));
|
||||||
flare.setScaleY((float) (1.0 + 0.5 * (Math.random() - 0.5)));
|
flare.setScaleY((float) (1.0 + 0.5 * (Math.random() - 0.5)));
|
||||||
flare.setRotZ((float) (0.5 * (Math.random() - 0.5)));
|
flare.setRotZ((float) (0.5 * (Math.random() - 0.5)));
|
||||||
|
@ -108,7 +108,7 @@ public class MarlinItemModel extends GeoModel<MarlinItem> {
|
||||||
yaw = player.getPersistentData().getDouble("yaw");
|
yaw = player.getPersistentData().getDouble("yaw");
|
||||||
|
|
||||||
double pit = 0;
|
double pit = 0;
|
||||||
pit = player.getPersistentData().getDouble("gunpitch");
|
pit = player.getPersistentData().getDouble("gun_pitch");
|
||||||
|
|
||||||
double vy = 0;
|
double vy = 0;
|
||||||
vy = player.getPersistentData().getDouble("vy");
|
vy = player.getPersistentData().getDouble("vy");
|
||||||
|
|
|
@ -48,7 +48,7 @@ public class MinigunItemModel extends GeoModel<Minigun> {
|
||||||
|
|
||||||
|
|
||||||
double fp = 0;
|
double fp = 0;
|
||||||
fp = player.getPersistentData().getDouble("firepos");
|
fp = player.getPersistentData().getDouble("fire_pos");
|
||||||
|
|
||||||
shen.setPosZ((float) fp);
|
shen.setPosZ((float) fp);
|
||||||
|
|
||||||
|
@ -60,7 +60,7 @@ public class MinigunItemModel extends GeoModel<Minigun> {
|
||||||
shen.setRotZ(-0.003f * (float) fp);
|
shen.setRotZ(-0.003f * (float) fp);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("fireanim") > 0) {
|
if (stack.getOrCreateTag().getInt("fire_animation") > 0) {
|
||||||
flare.setScaleX((float) (1 + 0.5 * (Math.random() - 0.5)));
|
flare.setScaleX((float) (1 + 0.5 * (Math.random() - 0.5)));
|
||||||
flare.setScaleY((float) (1 + 0.5 * (Math.random() - 0.5)));
|
flare.setScaleY((float) (1 + 0.5 * (Math.random() - 0.5)));
|
||||||
flare.setRotZ((float) (0.5 * (Math.random() - 0.5)));
|
flare.setRotZ((float) (0.5 * (Math.random() - 0.5)));
|
||||||
|
@ -90,7 +90,7 @@ public class MinigunItemModel extends GeoModel<Minigun> {
|
||||||
yaw = player.getPersistentData().getDouble("yaw");
|
yaw = player.getPersistentData().getDouble("yaw");
|
||||||
|
|
||||||
double pit = 0;
|
double pit = 0;
|
||||||
pit = player.getPersistentData().getDouble("gunpitch");
|
pit = player.getPersistentData().getDouble("gun_pitch");
|
||||||
|
|
||||||
double vy = 0;
|
double vy = 0;
|
||||||
vy = player.getPersistentData().getDouble("vy");
|
vy = player.getPersistentData().getDouble("vy");
|
||||||
|
|
|
@ -46,10 +46,10 @@ public class Mk14ItemModel extends GeoModel<Mk14Item> {
|
||||||
}
|
}
|
||||||
|
|
||||||
double p = 0;
|
double p = 0;
|
||||||
p = player.getPersistentData().getDouble("zoompos");
|
p = player.getPersistentData().getDouble("zoom_pos");
|
||||||
|
|
||||||
double zp = 0;
|
double zp = 0;
|
||||||
zp = player.getPersistentData().getDouble("zoomposz");
|
zp = player.getPersistentData().getDouble("zoom_pos_z");
|
||||||
|
|
||||||
gun.setPosX(6.372f * (float) p);
|
gun.setPosX(6.372f * (float) p);
|
||||||
|
|
||||||
|
@ -66,7 +66,7 @@ public class Mk14ItemModel extends GeoModel<Mk14Item> {
|
||||||
CoreGeoBone shen = getAnimationProcessor().getBone("shen");
|
CoreGeoBone shen = getAnimationProcessor().getBone("shen");
|
||||||
|
|
||||||
double fp = 0;
|
double fp = 0;
|
||||||
fp = player.getPersistentData().getDouble("firepos");
|
fp = player.getPersistentData().getDouble("fire_pos");
|
||||||
|
|
||||||
shen.setPosZ(3f * (float) fp);
|
shen.setPosZ(3f * (float) fp);
|
||||||
|
|
||||||
|
@ -130,7 +130,7 @@ public class Mk14ItemModel extends GeoModel<Mk14Item> {
|
||||||
yaw = player.getPersistentData().getDouble("yaw");
|
yaw = player.getPersistentData().getDouble("yaw");
|
||||||
|
|
||||||
double pit = 0;
|
double pit = 0;
|
||||||
pit = player.getPersistentData().getDouble("gunpitch");
|
pit = player.getPersistentData().getDouble("gun_pitch");
|
||||||
|
|
||||||
double vy = 0;
|
double vy = 0;
|
||||||
vy = player.getPersistentData().getDouble("vy");
|
vy = player.getPersistentData().getDouble("vy");
|
||||||
|
|
|
@ -41,7 +41,7 @@ public class RpgItemModel extends GeoModel<RpgItem> {
|
||||||
}
|
}
|
||||||
|
|
||||||
double fp = 0;
|
double fp = 0;
|
||||||
fp = player.getPersistentData().getDouble("firepos");
|
fp = player.getPersistentData().getDouble("fire_pos");
|
||||||
|
|
||||||
shen.setPosZ((float) fp);
|
shen.setPosZ((float) fp);
|
||||||
|
|
||||||
|
@ -54,10 +54,10 @@ public class RpgItemModel extends GeoModel<RpgItem> {
|
||||||
}
|
}
|
||||||
|
|
||||||
double p = 0;
|
double p = 0;
|
||||||
p = player.getPersistentData().getDouble("zoompos");
|
p = player.getPersistentData().getDouble("zoom_pos");
|
||||||
|
|
||||||
double zp = 0;
|
double zp = 0;
|
||||||
zp = player.getPersistentData().getDouble("zoomposz");
|
zp = player.getPersistentData().getDouble("zoom_pos_z");
|
||||||
|
|
||||||
gun.setPosX(0.91f * (float) p);
|
gun.setPosX(0.91f * (float) p);
|
||||||
|
|
||||||
|
@ -69,7 +69,7 @@ public class RpgItemModel extends GeoModel<RpgItem> {
|
||||||
|
|
||||||
CoreGeoBone flare = getAnimationProcessor().getBone("flare");
|
CoreGeoBone flare = getAnimationProcessor().getBone("flare");
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("fireanim") > 0) {
|
if (stack.getOrCreateTag().getInt("fire_animation") > 0) {
|
||||||
flare.setScaleX((float) (1.0 + 0.5 * (Math.random() - 0.5)));
|
flare.setScaleX((float) (1.0 + 0.5 * (Math.random() - 0.5)));
|
||||||
flare.setScaleY((float) (1.0 + 0.5 * (Math.random() - 0.5)));
|
flare.setScaleY((float) (1.0 + 0.5 * (Math.random() - 0.5)));
|
||||||
flare.setRotZ((float) (0.5 * (Math.random() - 0.5)));
|
flare.setRotZ((float) (0.5 * (Math.random() - 0.5)));
|
||||||
|
@ -98,7 +98,7 @@ public class RpgItemModel extends GeoModel<RpgItem> {
|
||||||
yaw = player.getPersistentData().getDouble("yaw");
|
yaw = player.getPersistentData().getDouble("yaw");
|
||||||
|
|
||||||
double pit = 0;
|
double pit = 0;
|
||||||
pit = player.getPersistentData().getDouble("gunpitch");
|
pit = player.getPersistentData().getDouble("gun_pitch");
|
||||||
|
|
||||||
double vy = 0;
|
double vy = 0;
|
||||||
vy = player.getPersistentData().getDouble("vy");
|
vy = player.getPersistentData().getDouble("vy");
|
||||||
|
|
|
@ -40,10 +40,10 @@ public class RpkItemModel extends GeoModel<RpkItem> {
|
||||||
ItemStack stack = player.getMainHandItem();
|
ItemStack stack = player.getMainHandItem();
|
||||||
|
|
||||||
double p = 0;
|
double p = 0;
|
||||||
p = player.getPersistentData().getDouble("zoompos");
|
p = player.getPersistentData().getDouble("zoom_pos");
|
||||||
|
|
||||||
double zp = 0;
|
double zp = 0;
|
||||||
zp = player.getPersistentData().getDouble("zoomposz");
|
zp = player.getPersistentData().getDouble("zoom_pos_z");
|
||||||
|
|
||||||
gun.setPosX(1.69f * (float) p);
|
gun.setPosX(1.69f * (float) p);
|
||||||
|
|
||||||
|
@ -82,7 +82,7 @@ public class RpkItemModel extends GeoModel<RpkItem> {
|
||||||
}
|
}
|
||||||
|
|
||||||
double fp = 0;
|
double fp = 0;
|
||||||
fp = player.getPersistentData().getDouble("firepos");
|
fp = player.getPersistentData().getDouble("fire_pos");
|
||||||
|
|
||||||
shen.setPosZ((float) fp);
|
shen.setPosZ((float) fp);
|
||||||
|
|
||||||
|
@ -129,7 +129,7 @@ public class RpkItemModel extends GeoModel<RpkItem> {
|
||||||
yaw = player.getPersistentData().getDouble("yaw");
|
yaw = player.getPersistentData().getDouble("yaw");
|
||||||
|
|
||||||
double pit = 0;
|
double pit = 0;
|
||||||
pit = player.getPersistentData().getDouble("gunpitch");
|
pit = player.getPersistentData().getDouble("gun_pitch");
|
||||||
|
|
||||||
double vy = 0;
|
double vy = 0;
|
||||||
vy = player.getPersistentData().getDouble("vy");
|
vy = player.getPersistentData().getDouble("vy");
|
||||||
|
|
|
@ -43,10 +43,10 @@ public class SentinelItemModel extends GeoModel<SentinelItem> {
|
||||||
ItemStack stack = player.getMainHandItem();
|
ItemStack stack = player.getMainHandItem();
|
||||||
|
|
||||||
double p = 0;
|
double p = 0;
|
||||||
p = player.getPersistentData().getDouble("zoompos");
|
p = player.getPersistentData().getDouble("zoom_pos");
|
||||||
|
|
||||||
double zp = 0;
|
double zp = 0;
|
||||||
zp = player.getPersistentData().getDouble("zoomposz");
|
zp = player.getPersistentData().getDouble("zoom_pos_z");
|
||||||
|
|
||||||
gun.setPosX(3.08f * (float) p);
|
gun.setPosX(3.08f * (float) p);
|
||||||
|
|
||||||
|
@ -78,7 +78,7 @@ public class SentinelItemModel extends GeoModel<SentinelItem> {
|
||||||
}
|
}
|
||||||
|
|
||||||
double fp = 0;
|
double fp = 0;
|
||||||
fp = player.getPersistentData().getDouble("firepos");
|
fp = player.getPersistentData().getDouble("fire_pos");
|
||||||
|
|
||||||
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
|
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
|
||||||
shen.setPosZ(3f * (float) fp);
|
shen.setPosZ(3f * (float) fp);
|
||||||
|
@ -131,7 +131,7 @@ public class SentinelItemModel extends GeoModel<SentinelItem> {
|
||||||
yaw = player.getPersistentData().getDouble("yaw");
|
yaw = player.getPersistentData().getDouble("yaw");
|
||||||
|
|
||||||
double pit = 0;
|
double pit = 0;
|
||||||
pit = player.getPersistentData().getDouble("gunpitch");
|
pit = player.getPersistentData().getDouble("gun_pitch");
|
||||||
|
|
||||||
double vy = 0;
|
double vy = 0;
|
||||||
vy = player.getPersistentData().getDouble("vy");
|
vy = player.getPersistentData().getDouble("vy");
|
||||||
|
|
|
@ -42,10 +42,10 @@ public class SksItemModel extends GeoModel<SksItem> {
|
||||||
}
|
}
|
||||||
|
|
||||||
double p = 0;
|
double p = 0;
|
||||||
p = player.getPersistentData().getDouble("zoompos");
|
p = player.getPersistentData().getDouble("zoom_pos");
|
||||||
|
|
||||||
double zp = 0;
|
double zp = 0;
|
||||||
zp = player.getPersistentData().getDouble("zoomposz");
|
zp = player.getPersistentData().getDouble("zoom_pos_z");
|
||||||
|
|
||||||
gun.setPosX(2.09f * (float) p);
|
gun.setPosX(2.09f * (float) p);
|
||||||
|
|
||||||
|
@ -67,7 +67,7 @@ public class SksItemModel extends GeoModel<SksItem> {
|
||||||
CoreGeoBone shen = getAnimationProcessor().getBone("shen");
|
CoreGeoBone shen = getAnimationProcessor().getBone("shen");
|
||||||
|
|
||||||
double fp = 0;
|
double fp = 0;
|
||||||
fp = player.getPersistentData().getDouble("firepos");
|
fp = player.getPersistentData().getDouble("fire_pos");
|
||||||
|
|
||||||
shen.setPosZ((float) fp);
|
shen.setPosZ((float) fp);
|
||||||
|
|
||||||
|
@ -114,7 +114,7 @@ public class SksItemModel extends GeoModel<SksItem> {
|
||||||
yaw = player.getPersistentData().getDouble("yaw");
|
yaw = player.getPersistentData().getDouble("yaw");
|
||||||
|
|
||||||
double pit = 0;
|
double pit = 0;
|
||||||
pit = player.getPersistentData().getDouble("gunpitch");
|
pit = player.getPersistentData().getDouble("gun_pitch");
|
||||||
|
|
||||||
double vy = 0;
|
double vy = 0;
|
||||||
vy = player.getPersistentData().getDouble("vy");
|
vy = player.getPersistentData().getDouble("vy");
|
||||||
|
|
|
@ -45,10 +45,10 @@ public class SvdItemModel extends GeoModel<SvdItem> {
|
||||||
}
|
}
|
||||||
|
|
||||||
double p = 0;
|
double p = 0;
|
||||||
p = player.getPersistentData().getDouble("zoompos");
|
p = player.getPersistentData().getDouble("zoom_pos");
|
||||||
|
|
||||||
double zp = 0;
|
double zp = 0;
|
||||||
zp = player.getPersistentData().getDouble("zoomposz");
|
zp = player.getPersistentData().getDouble("zoom_pos_z");
|
||||||
|
|
||||||
gun.setPosX(2.52f * (float) p);
|
gun.setPosX(2.52f * (float) p);
|
||||||
|
|
||||||
|
@ -84,7 +84,7 @@ public class SvdItemModel extends GeoModel<SvdItem> {
|
||||||
CoreGeoBone shen = getAnimationProcessor().getBone("shen");
|
CoreGeoBone shen = getAnimationProcessor().getBone("shen");
|
||||||
|
|
||||||
double fp = 0;
|
double fp = 0;
|
||||||
fp = player.getPersistentData().getDouble("firepos");
|
fp = player.getPersistentData().getDouble("fire_pos");
|
||||||
|
|
||||||
shen.setPosZ(1.8f * (float) fp);
|
shen.setPosZ(1.8f * (float) fp);
|
||||||
|
|
||||||
|
@ -137,7 +137,7 @@ public class SvdItemModel extends GeoModel<SvdItem> {
|
||||||
yaw = player.getPersistentData().getDouble("yaw");
|
yaw = player.getPersistentData().getDouble("yaw");
|
||||||
|
|
||||||
double pit = 0;
|
double pit = 0;
|
||||||
pit = player.getPersistentData().getDouble("gunpitch");
|
pit = player.getPersistentData().getDouble("gun_pitch");
|
||||||
|
|
||||||
double vy = 0;
|
double vy = 0;
|
||||||
vy = player.getPersistentData().getDouble("vy");
|
vy = player.getPersistentData().getDouble("vy");
|
||||||
|
|
|
@ -32,17 +32,17 @@ public class TaserItemModel extends GeoModel<Taser> {
|
||||||
Player player = Minecraft.getInstance().player;
|
Player player = Minecraft.getInstance().player;
|
||||||
|
|
||||||
double fp = 0;
|
double fp = 0;
|
||||||
fp = player.getPersistentData().getDouble("firepos");
|
fp = player.getPersistentData().getDouble("fire_pos");
|
||||||
|
|
||||||
shen.setPosZ(0.75f * (float) fp);
|
shen.setPosZ(0.75f * (float) fp);
|
||||||
|
|
||||||
shen.setRotX(0.02f * (float) fp);
|
shen.setRotX(0.02f * (float) fp);
|
||||||
|
|
||||||
double p = 0;
|
double p = 0;
|
||||||
p = player.getPersistentData().getDouble("zoompos");
|
p = player.getPersistentData().getDouble("zoom_pos");
|
||||||
|
|
||||||
double zp = 0;
|
double zp = 0;
|
||||||
zp = player.getPersistentData().getDouble("zoomposz");
|
zp = player.getPersistentData().getDouble("zoom_pos_z");
|
||||||
|
|
||||||
gun.setPosX(2.6f * (float) p);
|
gun.setPosX(2.6f * (float) p);
|
||||||
|
|
||||||
|
@ -71,7 +71,7 @@ public class TaserItemModel extends GeoModel<Taser> {
|
||||||
yaw = player.getPersistentData().getDouble("yaw");
|
yaw = player.getPersistentData().getDouble("yaw");
|
||||||
|
|
||||||
double pit = 0;
|
double pit = 0;
|
||||||
pit = player.getPersistentData().getDouble("gunpitch");
|
pit = player.getPersistentData().getDouble("gun_pitch");
|
||||||
|
|
||||||
double vy = 0;
|
double vy = 0;
|
||||||
vy = player.getPersistentData().getDouble("vy");
|
vy = player.getPersistentData().getDouble("vy");
|
||||||
|
|
|
@ -35,10 +35,10 @@ public class TracheliumItemModel extends GeoModel<Trachelium> {
|
||||||
ItemStack stack = player.getMainHandItem();
|
ItemStack stack = player.getMainHandItem();
|
||||||
|
|
||||||
double p = 0;
|
double p = 0;
|
||||||
p = player.getPersistentData().getDouble("zoompos");
|
p = player.getPersistentData().getDouble("zoom_pos");
|
||||||
|
|
||||||
double zp = 0;
|
double zp = 0;
|
||||||
zp = player.getPersistentData().getDouble("zoomposz");
|
zp = player.getPersistentData().getDouble("zoom_pos_z");
|
||||||
|
|
||||||
gun.setPosX(1.48f * (float) p);
|
gun.setPosX(1.48f * (float) p);
|
||||||
|
|
||||||
|
@ -51,7 +51,7 @@ public class TracheliumItemModel extends GeoModel<Trachelium> {
|
||||||
gun.setScaleZ(1f - (0.2f * (float) p));
|
gun.setScaleZ(1f - (0.2f * (float) p));
|
||||||
|
|
||||||
double fp = 0;
|
double fp = 0;
|
||||||
fp = player.getPersistentData().getDouble("firepos");
|
fp = player.getPersistentData().getDouble("fire_pos");
|
||||||
|
|
||||||
shen.setPosZ(4f * (float) fp);
|
shen.setPosZ(4f * (float) fp);
|
||||||
|
|
||||||
|
@ -94,7 +94,7 @@ public class TracheliumItemModel extends GeoModel<Trachelium> {
|
||||||
yaw = player.getPersistentData().getDouble("yaw");
|
yaw = player.getPersistentData().getDouble("yaw");
|
||||||
|
|
||||||
double pit = 0;
|
double pit = 0;
|
||||||
pit = player.getPersistentData().getDouble("gunpitch");
|
pit = player.getPersistentData().getDouble("gun_pitch");
|
||||||
|
|
||||||
double vy = 0;
|
double vy = 0;
|
||||||
vy = player.getPersistentData().getDouble("vy");
|
vy = player.getPersistentData().getDouble("vy");
|
||||||
|
|
|
@ -34,10 +34,10 @@ public class VectorItemModel extends GeoModel<VectorItem> {
|
||||||
Player player = Minecraft.getInstance().player;
|
Player player = Minecraft.getInstance().player;
|
||||||
|
|
||||||
double p = 0;
|
double p = 0;
|
||||||
p = player.getPersistentData().getDouble("zoompos");
|
p = player.getPersistentData().getDouble("zoom_pos");
|
||||||
|
|
||||||
double zp = 0;
|
double zp = 0;
|
||||||
zp = player.getPersistentData().getDouble("zoomposz");
|
zp = player.getPersistentData().getDouble("zoom_pos_z");
|
||||||
|
|
||||||
gun.setPosX(2.62f * (float) p);
|
gun.setPosX(2.62f * (float) p);
|
||||||
|
|
||||||
|
@ -67,7 +67,7 @@ public class VectorItemModel extends GeoModel<VectorItem> {
|
||||||
}
|
}
|
||||||
|
|
||||||
double fp = 0;
|
double fp = 0;
|
||||||
fp = player.getPersistentData().getDouble("firepos");
|
fp = player.getPersistentData().getDouble("fire_pos");
|
||||||
|
|
||||||
shen.setPosZ(0.75f * (float) fp);
|
shen.setPosZ(0.75f * (float) fp);
|
||||||
|
|
||||||
|
@ -102,7 +102,7 @@ public class VectorItemModel extends GeoModel<VectorItem> {
|
||||||
yaw = player.getPersistentData().getDouble("yaw");
|
yaw = player.getPersistentData().getDouble("yaw");
|
||||||
|
|
||||||
double pit = 0;
|
double pit = 0;
|
||||||
pit = player.getPersistentData().getDouble("gunpitch");
|
pit = player.getPersistentData().getDouble("gun_pitch");
|
||||||
|
|
||||||
double vy = 0;
|
double vy = 0;
|
||||||
vy = player.getPersistentData().getDouble("vy");
|
vy = player.getPersistentData().getDouble("vy");
|
||||||
|
|
|
@ -83,9 +83,8 @@ public class BocekarrowEntity extends AbstractArrow implements ItemSupplier {
|
||||||
protected void onHitEntity(EntityHitResult result) {
|
protected void onHitEntity(EntityHitResult result) {
|
||||||
Entity entity = result.getEntity();
|
Entity entity = result.getEntity();
|
||||||
if (this.getOwner() instanceof LivingEntity living) {
|
if (this.getOwner() instanceof LivingEntity living) {
|
||||||
double _setval = 25;
|
|
||||||
living.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
|
living.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
|
||||||
capability.hitIndicator = _setval;
|
capability.hitIndicator = 25;
|
||||||
capability.syncPlayerVariables(living);
|
capability.syncPlayerVariables(living);
|
||||||
});
|
});
|
||||||
if (!living.level().isClientSide() && living.getServer() != null) {
|
if (!living.level().isClientSide() && living.getServer() != null) {
|
||||||
|
@ -119,9 +118,8 @@ public class BocekarrowEntity extends AbstractArrow implements ItemSupplier {
|
||||||
if (headshot) {
|
if (headshot) {
|
||||||
if (this.getOwner() instanceof LivingEntity living) {
|
if (this.getOwner() instanceof LivingEntity living) {
|
||||||
setBaseDamage(getBaseDamage() * 2);
|
setBaseDamage(getBaseDamage() * 2);
|
||||||
double _setval = 25;
|
|
||||||
living.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
|
living.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
|
||||||
capability.headIndicator = _setval;
|
capability.headIndicator = 25;
|
||||||
capability.syncPlayerVariables(living);
|
capability.syncPlayerVariables(living);
|
||||||
});
|
});
|
||||||
if (!living.level().isClientSide() && living.getServer() != null) {
|
if (!living.level().isClientSide() && living.getServer() != null) {
|
||||||
|
|
|
@ -221,12 +221,12 @@ public class ClaymoreEntity extends TamableAnimal implements GeoEntity, Animated
|
||||||
var y = this.getY();
|
var y = this.getY();
|
||||||
var z = this.getZ();
|
var z = this.getZ();
|
||||||
|
|
||||||
if (data.getDouble("claymore") > 0) {
|
if (data.getInt("claymore") > 0) {
|
||||||
data.putDouble("claymore", data.getDouble("claymore") - 1);
|
data.putInt("claymore", data.getInt("claymore") - 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
data.putDouble("life", data.getDouble("life") + 1);
|
data.putInt("life", data.getInt("life") + 1);
|
||||||
if (data.getDouble("life") >= 12000) {
|
if (data.getInt("life") >= 12000) {
|
||||||
if (!this.level().isClientSide()) this.discard();
|
if (!this.level().isClientSide()) this.discard();
|
||||||
}
|
}
|
||||||
if (data.getDouble("def") >= 100) {
|
if (data.getDouble("def") >= 100) {
|
||||||
|
@ -250,10 +250,10 @@ public class ClaymoreEntity extends TamableAnimal implements GeoEntity, Animated
|
||||||
}
|
}
|
||||||
this.removeAllEffects();
|
this.removeAllEffects();
|
||||||
this.clearFire();
|
this.clearFire();
|
||||||
if (data.getDouble("trigger") <= 60) {
|
if (data.getInt("trigger") <= 60) {
|
||||||
data.putDouble("trigger", data.getDouble("trigger") + 1);
|
data.putInt("trigger", data.getInt("trigger") + 1);
|
||||||
}
|
}
|
||||||
if (data.getDouble("trigger") >= 40) {
|
if (data.getInt("trigger") >= 40) {
|
||||||
final Vec3 center = new Vec3(x + 1.5 * this.getLookAngle().x, y + 1.5 * this.getLookAngle().y, z + 1.5 * this.getLookAngle().z);
|
final Vec3 center = new Vec3(x + 1.5 * this.getLookAngle().x, y + 1.5 * this.getLookAngle().y, z + 1.5 * this.getLookAngle().z);
|
||||||
for (Entity target : level.getEntitiesOfClass(Entity.class, new AABB(center, center).inflate(2.5 / 2d), e -> true).stream().sorted(Comparator.comparingDouble(e -> e.distanceToSqr(center))).toList()) {
|
for (Entity target : level.getEntitiesOfClass(Entity.class, new AABB(center, center).inflate(2.5 / 2d), e -> true).stream().sorted(Comparator.comparingDouble(e -> e.distanceToSqr(center))).toList()) {
|
||||||
var condition = this.getOwner() != target
|
var condition = this.getOwner() != target
|
||||||
|
@ -272,7 +272,7 @@ public class ClaymoreEntity extends TamableAnimal implements GeoEntity, Animated
|
||||||
}
|
}
|
||||||
this.discard();
|
this.discard();
|
||||||
}
|
}
|
||||||
target.getPersistentData().putDouble("claymore", 5);
|
target.getPersistentData().putInt("claymore", 5);
|
||||||
TargetMod.queueServerWork(1, () -> {
|
TargetMod.queueServerWork(1, () -> {
|
||||||
if (!level.isClientSide())
|
if (!level.isClientSide())
|
||||||
level.explode(this.getOwner(), target.getX(), target.getY(), target.getZ(), 6.5f, Level.ExplosionInteraction.NONE);
|
level.explode(this.getOwner(), target.getX(), target.getY(), target.getZ(), 6.5f, Level.ExplosionInteraction.NONE);
|
||||||
|
|
|
@ -3,13 +3,14 @@ package net.mcreator.target.entity;
|
||||||
import net.mcreator.target.headshot.BoundingBoxManager;
|
import net.mcreator.target.headshot.BoundingBoxManager;
|
||||||
import net.mcreator.target.headshot.IHeadshotBox;
|
import net.mcreator.target.headshot.IHeadshotBox;
|
||||||
import net.mcreator.target.init.TargetModEntities;
|
import net.mcreator.target.init.TargetModEntities;
|
||||||
|
import net.mcreator.target.init.TargetModSounds;
|
||||||
import net.mcreator.target.network.TargetModVariables;
|
import net.mcreator.target.network.TargetModVariables;
|
||||||
import net.minecraft.commands.CommandSource;
|
import net.minecraft.commands.CommandSource;
|
||||||
import net.minecraft.commands.CommandSourceStack;
|
import net.minecraft.commands.CommandSourceStack;
|
||||||
import net.minecraft.network.protocol.Packet;
|
import net.minecraft.network.protocol.Packet;
|
||||||
import net.minecraft.network.protocol.game.ClientGamePacketListener;
|
import net.minecraft.network.protocol.game.ClientGamePacketListener;
|
||||||
import net.minecraft.server.level.ServerLevel;
|
import net.minecraft.server.level.ServerLevel;
|
||||||
import net.minecraft.util.RandomSource;
|
import net.minecraft.sounds.SoundSource;
|
||||||
import net.minecraft.world.entity.Entity;
|
import net.minecraft.world.entity.Entity;
|
||||||
import net.minecraft.world.entity.EntityType;
|
import net.minecraft.world.entity.EntityType;
|
||||||
import net.minecraft.world.entity.LivingEntity;
|
import net.minecraft.world.entity.LivingEntity;
|
||||||
|
@ -76,9 +77,8 @@ public class GunGrenadeEntity extends AbstractArrow implements ItemSupplier {
|
||||||
final Vec3 position = this.position();
|
final Vec3 position = this.position();
|
||||||
Entity entity = result.getEntity();
|
Entity entity = result.getEntity();
|
||||||
if (this.getOwner() instanceof LivingEntity living) {
|
if (this.getOwner() instanceof LivingEntity living) {
|
||||||
double _setval = 25;
|
|
||||||
living.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
|
living.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
|
||||||
capability.hitIndicator = _setval;
|
capability.hitIndicator = 25;
|
||||||
capability.syncPlayerVariables(living);
|
capability.syncPlayerVariables(living);
|
||||||
});
|
});
|
||||||
if (!living.level().isClientSide() && living.getServer() != null) {
|
if (!living.level().isClientSide() && living.getServer() != null) {
|
||||||
|
@ -87,7 +87,7 @@ public class GunGrenadeEntity extends AbstractArrow implements ItemSupplier {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.getPersistentData().getDouble("baoxian") > 0) {
|
if (this.getPersistentData().getInt("fuse") > 0) {
|
||||||
|
|
||||||
if (this.level() instanceof ServerLevel level) {
|
if (this.level() instanceof ServerLevel level) {
|
||||||
level.explode(this, (this.getX()), (this.getY()), (this.getZ()), 5.5f, Level.ExplosionInteraction.NONE);
|
level.explode(this, (this.getX()), (this.getY()), (this.getZ()), 5.5f, Level.ExplosionInteraction.NONE);
|
||||||
|
@ -125,14 +125,12 @@ public class GunGrenadeEntity extends AbstractArrow implements ItemSupplier {
|
||||||
if (headshot) {
|
if (headshot) {
|
||||||
if (this.getOwner() instanceof LivingEntity living) {
|
if (this.getOwner() instanceof LivingEntity living) {
|
||||||
setBaseDamage(getBaseDamage() * 2);
|
setBaseDamage(getBaseDamage() * 2);
|
||||||
double _setval = 25;
|
|
||||||
living.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
|
living.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
|
||||||
capability.headIndicator = _setval;
|
capability.headIndicator = 25;
|
||||||
capability.syncPlayerVariables(living);
|
capability.syncPlayerVariables(living);
|
||||||
});
|
});
|
||||||
if (!living.level().isClientSide() && living.getServer() != null) {
|
if (!living.level().isClientSide()) {
|
||||||
living.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, living.position(), living.getRotationVector(), living.level() instanceof ServerLevel ? (ServerLevel) living.level() : null, 4,
|
living.level().playSound(null, living.getX(), living.getY(), living.getZ(), TargetModSounds.HEADSHOT.get(), SoundSource.VOICE, 1f, 1f);
|
||||||
living.getName().getString(), living.getDisplayName(), living.level().getServer(), living), "playsound target:headshot voice @a ~ ~ ~ 1 1");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -146,7 +144,7 @@ public class GunGrenadeEntity extends AbstractArrow implements ItemSupplier {
|
||||||
@Override
|
@Override
|
||||||
public void onHitBlock(BlockHitResult blockHitResult) {
|
public void onHitBlock(BlockHitResult blockHitResult) {
|
||||||
super.onHitBlock(blockHitResult);
|
super.onHitBlock(blockHitResult);
|
||||||
if (this.getPersistentData().getDouble("baoxian") > 0) {
|
if (this.getPersistentData().getInt("fuse") > 0) {
|
||||||
if (this.level() instanceof ServerLevel level) {
|
if (this.level() instanceof ServerLevel level) {
|
||||||
this.level().explode(this, this.getX(), this.getY(), this.getZ(), 5.5f, Level.ExplosionInteraction.NONE);
|
this.level().explode(this, this.getX(), this.getY(), this.getZ(), 5.5f, Level.ExplosionInteraction.NONE);
|
||||||
}
|
}
|
||||||
|
@ -157,7 +155,7 @@ public class GunGrenadeEntity extends AbstractArrow implements ItemSupplier {
|
||||||
public void tick() {
|
public void tick() {
|
||||||
super.tick();
|
super.tick();
|
||||||
|
|
||||||
this.getPersistentData().putDouble("baoxian", (this.getPersistentData().getDouble("baoxian") + 1));
|
this.getPersistentData().putInt("fuse", this.getPersistentData().getInt("fuse") + 1);
|
||||||
|
|
||||||
// TODO 修改为正确的粒子效果添加
|
// TODO 修改为正确的粒子效果添加
|
||||||
if (!this.level().isClientSide() && this.getServer() != null) {
|
if (!this.level().isClientSide() && this.getServer() != null) {
|
||||||
|
|
|
@ -95,7 +95,7 @@ public class RpgRocketEntity extends AbstractArrow implements ItemSupplier {
|
||||||
living.getName().getString(), living.getDisplayName(), living.level().getServer(), living), "playsound target:indication voice @a ~ ~ ~ 1 1");
|
living.getName().getString(), living.getDisplayName(), living.level().getServer(), living), "playsound target:indication voice @a ~ ~ ~ 1 1");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (this.getPersistentData().getDouble("time") > 0) {
|
if (this.getPersistentData().getInt("time") > 0) {
|
||||||
if (this.level() instanceof ServerLevel level) {
|
if (this.level() instanceof ServerLevel level) {
|
||||||
level.explode(this, this.getX(), this.getY(), this.getZ(), 4, Level.ExplosionInteraction.NONE);
|
level.explode(this, this.getX(), this.getY(), this.getZ(), 4, Level.ExplosionInteraction.NONE);
|
||||||
|
|
||||||
|
@ -134,9 +134,8 @@ public class RpgRocketEntity extends AbstractArrow implements ItemSupplier {
|
||||||
if (headshot) {
|
if (headshot) {
|
||||||
if (this.getOwner() instanceof LivingEntity living) {
|
if (this.getOwner() instanceof LivingEntity living) {
|
||||||
setBaseDamage(getBaseDamage() * 5);
|
setBaseDamage(getBaseDamage() * 5);
|
||||||
double _setval = 25;
|
|
||||||
living.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
|
living.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
|
||||||
capability.headIndicator = _setval;
|
capability.headIndicator = 25;
|
||||||
capability.syncPlayerVariables(living);
|
capability.syncPlayerVariables(living);
|
||||||
});
|
});
|
||||||
if (!living.level().isClientSide() && living.getServer() != null) {
|
if (!living.level().isClientSide() && living.getServer() != null) {
|
||||||
|
@ -161,7 +160,7 @@ public class RpgRocketEntity extends AbstractArrow implements ItemSupplier {
|
||||||
public void onHitBlock(BlockHitResult blockHitResult) {
|
public void onHitBlock(BlockHitResult blockHitResult) {
|
||||||
super.onHitBlock(blockHitResult);
|
super.onHitBlock(blockHitResult);
|
||||||
|
|
||||||
if (this.getPersistentData().getDouble("time") > 0) {
|
if (this.getPersistentData().getInt("time") > 0) {
|
||||||
if (this.level() instanceof ServerLevel level) {
|
if (this.level() instanceof ServerLevel level) {
|
||||||
level.explode(this, this.getX(), this.getY(), this.getZ(), 6, Level.ExplosionInteraction.NONE);
|
level.explode(this, this.getX(), this.getY(), this.getZ(), 6, Level.ExplosionInteraction.NONE);
|
||||||
}
|
}
|
||||||
|
@ -171,8 +170,8 @@ public class RpgRocketEntity extends AbstractArrow implements ItemSupplier {
|
||||||
public void tick() {
|
public void tick() {
|
||||||
super.tick();
|
super.tick();
|
||||||
|
|
||||||
this.getPersistentData().putDouble("time", (1 + this.getPersistentData().getDouble("time")));
|
this.getPersistentData().putInt("time", (1 + this.getPersistentData().getInt("time")));
|
||||||
double life = this.getPersistentData().getDouble("time");
|
double life = this.getPersistentData().getInt("time");
|
||||||
if (life == 4) {
|
if (life == 4) {
|
||||||
if (!this.level().isClientSide() && this.getServer() != null) {
|
if (!this.level().isClientSide() && this.getServer() != null) {
|
||||||
this.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, this.position(), this.getRotationVector(), this.level() instanceof ServerLevel ? (ServerLevel) this.level() : null, 4,
|
this.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, this.position(), this.getRotationVector(), this.level() instanceof ServerLevel ? (ServerLevel) this.level() : null, 4,
|
||||||
|
|
|
@ -150,8 +150,8 @@ public class SenpaiEntity extends Spider implements GeoEntity, AnimatedEntity {
|
||||||
public void baseTick() {
|
public void baseTick() {
|
||||||
super.baseTick();
|
super.baseTick();
|
||||||
|
|
||||||
this.getPersistentData().putDouble("findtarget", this.getPersistentData().getDouble("findtarget") + 1);
|
this.getPersistentData().putInt("find_target", this.getPersistentData().getInt("find_target") + 1);
|
||||||
double target = this.getPersistentData().getDouble("findtarget");
|
double target = this.getPersistentData().getInt("find_target");
|
||||||
if (target == 1) {
|
if (target == 1) {
|
||||||
final Vec3 center = new Vec3(this.getX(), this.getY(), this.getZ());
|
final Vec3 center = new Vec3(this.getX(), this.getY(), this.getZ());
|
||||||
this.level().getEntitiesOfClass(Entity.class, new AABB(center, center).inflate(1024 / 2d), e -> true)
|
this.level().getEntitiesOfClass(Entity.class, new AABB(center, center).inflate(1024 / 2d), e -> true)
|
||||||
|
@ -160,7 +160,7 @@ public class SenpaiEntity extends Spider implements GeoEntity, AnimatedEntity {
|
||||||
.filter(e -> e instanceof Player player && !player.isCreative())
|
.filter(e -> e instanceof Player player && !player.isCreative())
|
||||||
.forEach(e -> this.setTarget((LivingEntity) e));
|
.forEach(e -> this.setTarget((LivingEntity) e));
|
||||||
} else if (target >= 100) {
|
} else if (target >= 100) {
|
||||||
this.getPersistentData().putDouble("findtarget", 0);
|
this.getPersistentData().putInt("find_target", 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
this.refreshDimensions();
|
this.refreshDimensions();
|
||||||
|
|
|
@ -169,6 +169,27 @@ public class Target1Entity extends PathfinderMob implements GeoEntity, AnimatedE
|
||||||
this.setTexture(compound.getString("Texture"));
|
this.setTexture(compound.getString("Texture"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SubscribeEvent
|
||||||
|
public static void onTarget1Down(LivingDeathEvent event) {
|
||||||
|
if (event.getEntity() == null) return;
|
||||||
|
|
||||||
|
var entity = event.getEntity();
|
||||||
|
var sourceEntity = event.getSource().getEntity();
|
||||||
|
|
||||||
|
if (entity == null || sourceEntity == null) return;
|
||||||
|
|
||||||
|
if (entity instanceof Target1Entity target1) {
|
||||||
|
target1.setHealth(target1.getMaxHealth());
|
||||||
|
|
||||||
|
sourceEntity.level().playLocalSound(sourceEntity.blockPosition(), TargetModSounds.TARGETDOWN.get(), SoundSource.PLAYERS, 100, 1, false);
|
||||||
|
|
||||||
|
if (sourceEntity instanceof Player player)
|
||||||
|
player.displayClientMessage(Component.literal(("Target Down " + new java.text.DecimalFormat("##.#").format((entity.position()).distanceTo((sourceEntity.position()))) + "M")), true);
|
||||||
|
entity.getPersistentData().putDouble("target_down", 201);
|
||||||
|
event.setCanceled(true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public InteractionResult mobInteract(Player player, InteractionHand hand) {
|
public InteractionResult mobInteract(Player player, InteractionHand hand) {
|
||||||
InteractionResult result = InteractionResult.sidedSuccess(this.level().isClientSide());
|
InteractionResult result = InteractionResult.sidedSuccess(this.level().isClientSide());
|
||||||
|
@ -191,7 +212,7 @@ public class Target1Entity extends PathfinderMob implements GeoEntity, AnimatedE
|
||||||
this.yRotO = this.getYRot();
|
this.yRotO = this.getYRot();
|
||||||
this.xRotO = this.getXRot();
|
this.xRotO = this.getXRot();
|
||||||
|
|
||||||
this.getPersistentData().putDouble("targetdown", 0);
|
this.getPersistentData().putDouble("target_down", 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -212,12 +233,12 @@ public class Target1Entity extends PathfinderMob implements GeoEntity, AnimatedE
|
||||||
Runnable recoilRunnable = () -> {
|
Runnable recoilRunnable = () -> {
|
||||||
while (recoilTimer[0] < recoilDuration) {
|
while (recoilTimer[0] < recoilDuration) {
|
||||||
|
|
||||||
if (this.getPersistentData().getDouble("targetdown") > -1) {
|
if (this.getPersistentData().getDouble("target_down") > -1) {
|
||||||
this.getPersistentData().putDouble("targetdown", (this.getPersistentData().getDouble("targetdown") - 1));
|
this.getPersistentData().putDouble("target_down", this.getPersistentData().getDouble("target_down") - 1);
|
||||||
}
|
}
|
||||||
if (this.getPersistentData().getDouble("targetdown") > 195) {
|
if (this.getPersistentData().getDouble("target_down") > 195) {
|
||||||
this.setYRot(this.getYRot());
|
this.setYRot(this.getYRot());
|
||||||
this.setXRot((float) ((201 - this.getPersistentData().getDouble("targetdown")) * (-18)));
|
this.setXRot((float) (201 - this.getPersistentData().getDouble("target_down")) * -18);
|
||||||
this.setYBodyRot(this.getYRot());
|
this.setYBodyRot(this.getYRot());
|
||||||
this.setYHeadRot(this.getYRot());
|
this.setYHeadRot(this.getYRot());
|
||||||
this.yRotO = this.getYRot();
|
this.yRotO = this.getYRot();
|
||||||
|
@ -225,9 +246,9 @@ public class Target1Entity extends PathfinderMob implements GeoEntity, AnimatedE
|
||||||
this.yBodyRotO = this.getYRot();
|
this.yBodyRotO = this.getYRot();
|
||||||
this.yHeadRotO = this.getYRot();
|
this.yHeadRotO = this.getYRot();
|
||||||
}
|
}
|
||||||
if (this.getPersistentData().getDouble("targetdown") < 20 && this.getPersistentData().getDouble("targetdown") > -1) {
|
if (this.getPersistentData().getDouble("target_down") < 20 && this.getPersistentData().getDouble("target_down") > -1) {
|
||||||
this.setYRot(this.getYRot());
|
this.setYRot(this.getYRot());
|
||||||
this.setXRot((float) (-90 + (20 - this.getPersistentData().getDouble("targetdown")) * 4.5f));
|
this.setXRot((float) (-90 + 20 - this.getPersistentData().getDouble("target_down")) * 4.5f);
|
||||||
this.setYBodyRot(this.getYRot());
|
this.setYBodyRot(this.getYRot());
|
||||||
this.setYHeadRot(this.getYRot());
|
this.setYHeadRot(this.getYRot());
|
||||||
this.yRotO = this.getYRot();
|
this.yRotO = this.getYRot();
|
||||||
|
@ -250,18 +271,6 @@ public class Target1Entity extends PathfinderMob implements GeoEntity, AnimatedE
|
||||||
this.refreshDimensions();
|
this.refreshDimensions();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public EntityDimensions getDimensions(Pose p_33597_) {
|
|
||||||
float num;
|
|
||||||
if (this.getPersistentData().getDouble("targetdown") > 0) {
|
|
||||||
num = 0.1f;
|
|
||||||
} else {
|
|
||||||
num = 1f;
|
|
||||||
}
|
|
||||||
|
|
||||||
return super.getDimensions(p_33597_).scale(num);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isPushable() {
|
public boolean isPushable() {
|
||||||
|
@ -359,24 +368,15 @@ public class Target1Entity extends PathfinderMob implements GeoEntity, AnimatedE
|
||||||
return this.cache;
|
return this.cache;
|
||||||
}
|
}
|
||||||
|
|
||||||
@SubscribeEvent
|
@Override
|
||||||
public static void onTarget1Down(LivingDeathEvent event) {
|
public EntityDimensions getDimensions(Pose p_33597_) {
|
||||||
if (event.getEntity() == null) return;
|
float num;
|
||||||
|
if (this.getPersistentData().getDouble("target_down") > 0) {
|
||||||
|
num = 0.1f;
|
||||||
|
} else {
|
||||||
|
num = 1f;
|
||||||
|
}
|
||||||
|
|
||||||
var entity = event.getEntity();
|
return super.getDimensions(p_33597_).scale(num);
|
||||||
var sourceEntity = event.getSource().getEntity();
|
|
||||||
|
|
||||||
if (entity == null || sourceEntity == null) return;
|
|
||||||
|
|
||||||
if (entity instanceof Target1Entity target1) {
|
|
||||||
target1.setHealth(target1.getMaxHealth());
|
|
||||||
|
|
||||||
sourceEntity.level().playLocalSound(sourceEntity.blockPosition(), TargetModSounds.TARGETDOWN.get(), SoundSource.PLAYERS, 100, 1, false);
|
|
||||||
|
|
||||||
if (sourceEntity instanceof Player player)
|
|
||||||
player.displayClientMessage(Component.literal(("Target Down " + new java.text.DecimalFormat("##.#").format((entity.position()).distanceTo((sourceEntity.position()))) + "M")), true);
|
|
||||||
entity.getPersistentData().putDouble("targetdown", 201);
|
|
||||||
event.setCanceled(true);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,13 +4,12 @@ import net.mcreator.target.headshot.BoundingBoxManager;
|
||||||
import net.mcreator.target.headshot.IHeadshotBox;
|
import net.mcreator.target.headshot.IHeadshotBox;
|
||||||
import net.mcreator.target.init.TargetModEntities;
|
import net.mcreator.target.init.TargetModEntities;
|
||||||
import net.mcreator.target.init.TargetModMobEffects;
|
import net.mcreator.target.init.TargetModMobEffects;
|
||||||
|
import net.mcreator.target.init.TargetModSounds;
|
||||||
import net.mcreator.target.network.TargetModVariables;
|
import net.mcreator.target.network.TargetModVariables;
|
||||||
import net.minecraft.commands.CommandSource;
|
|
||||||
import net.minecraft.commands.CommandSourceStack;
|
|
||||||
import net.minecraft.nbt.CompoundTag;
|
import net.minecraft.nbt.CompoundTag;
|
||||||
import net.minecraft.network.protocol.Packet;
|
import net.minecraft.network.protocol.Packet;
|
||||||
import net.minecraft.network.protocol.game.ClientGamePacketListener;
|
import net.minecraft.network.protocol.game.ClientGamePacketListener;
|
||||||
import net.minecraft.server.level.ServerLevel;
|
import net.minecraft.sounds.SoundSource;
|
||||||
import net.minecraft.util.RandomSource;
|
import net.minecraft.util.RandomSource;
|
||||||
import net.minecraft.world.effect.MobEffectInstance;
|
import net.minecraft.world.effect.MobEffectInstance;
|
||||||
import net.minecraft.world.entity.Entity;
|
import net.minecraft.world.entity.Entity;
|
||||||
|
@ -74,6 +73,35 @@ public class TaserBulletProjectileEntity extends AbstractArrow implements ItemSu
|
||||||
entity.setArrowCount(entity.getArrowCount() - 1);
|
entity.setArrowCount(entity.getArrowCount() - 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static TaserBulletProjectileEntity shoot(Level world, LivingEntity entity, RandomSource random, float power, double damage, int knockback) {
|
||||||
|
TaserBulletProjectileEntity taserBullet = new TaserBulletProjectileEntity(TargetModEntities.TASER_BULLET_PROJECTILE.get(), entity, world);
|
||||||
|
taserBullet.shoot(entity.getViewVector(1).x, entity.getViewVector(1).y, entity.getViewVector(1).z, power * 2, 0);
|
||||||
|
taserBullet.setSilent(true);
|
||||||
|
taserBullet.setCritArrow(false);
|
||||||
|
taserBullet.setBaseDamage(damage);
|
||||||
|
taserBullet.setKnockback(knockback);
|
||||||
|
world.addFreshEntity(taserBullet);
|
||||||
|
return taserBullet;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static TaserBulletProjectileEntity shoot(LivingEntity entity, LivingEntity target) {
|
||||||
|
TaserBulletProjectileEntity taserBullet = new TaserBulletProjectileEntity(TargetModEntities.TASER_BULLET_PROJECTILE.get(), entity, entity.level());
|
||||||
|
double dx = target.getX() - entity.getX();
|
||||||
|
double dy = target.getY() + target.getEyeHeight() - 1.1;
|
||||||
|
double dz = target.getZ() - entity.getZ();
|
||||||
|
taserBullet.shoot(dx, dy - taserBullet.getY() + Math.hypot(dx, dz) * 0.2F, dz, 1f * 2, 12.0F);
|
||||||
|
taserBullet.setSilent(true);
|
||||||
|
taserBullet.setBaseDamage(5);
|
||||||
|
taserBullet.setKnockback(5);
|
||||||
|
taserBullet.setCritArrow(false);
|
||||||
|
entity.level().addFreshEntity(taserBullet);
|
||||||
|
return taserBullet;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static TaserBulletProjectileEntity shoot(Level world, LivingEntity entity, RandomSource source) {
|
||||||
|
return shoot(world, entity, source, 1f, 5, 5);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onHitEntity(EntityHitResult result) {
|
protected void onHitEntity(EntityHitResult result) {
|
||||||
Entity entity = result.getEntity();
|
Entity entity = result.getEntity();
|
||||||
|
@ -83,9 +111,8 @@ public class TaserBulletProjectileEntity extends AbstractArrow implements ItemSu
|
||||||
capability.syncPlayerVariables(living);
|
capability.syncPlayerVariables(living);
|
||||||
});
|
});
|
||||||
|
|
||||||
if (!living.level().isClientSide() && living.getServer() != null) {
|
if (!living.level().isClientSide()) {
|
||||||
living.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, living.position(), living.getRotationVector(), living.level() instanceof ServerLevel ? (ServerLevel) living.level() : null, 4,
|
living.level().playSound(null, living.blockPosition(), TargetModSounds.INDICATION.get(), SoundSource.VOICE, 1, 1);
|
||||||
living.getName().getString(), living.getDisplayName(), living.level().getServer(), living), "playsound target:indication voice @a ~ ~ ~ 1 1");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (entity instanceof LivingEntity) {
|
if (entity instanceof LivingEntity) {
|
||||||
|
@ -111,17 +138,14 @@ public class TaserBulletProjectileEntity extends AbstractArrow implements ItemSu
|
||||||
if (headshotHitPos.isPresent() && (hitPos == null || headshotHitPos.get().distanceTo(hitPos) < 0.55)) {
|
if (headshotHitPos.isPresent() && (hitPos == null || headshotHitPos.get().distanceTo(hitPos) < 0.55)) {
|
||||||
headshot = true;
|
headshot = true;
|
||||||
}
|
}
|
||||||
if (headshot) {
|
if (headshot && this.getOwner() instanceof LivingEntity living) {
|
||||||
if (this.getOwner() instanceof LivingEntity living) {
|
|
||||||
setBaseDamage(getBaseDamage() * 1.5f);
|
setBaseDamage(getBaseDamage() * 1.5f);
|
||||||
living.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
|
living.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
|
||||||
capability.headIndicator = 25;
|
capability.headIndicator = 25;
|
||||||
capability.syncPlayerVariables(living);
|
capability.syncPlayerVariables(living);
|
||||||
});
|
});
|
||||||
if (!living.level().isClientSide() && living.getServer() != null) {
|
if (!living.level().isClientSide()) {
|
||||||
living.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, living.position(), living.getRotationVector(), living.level() instanceof ServerLevel ? (ServerLevel) living.level() : null, 4,
|
living.level().playSound(null, living.blockPosition(), TargetModSounds.HEADSHOT.get(), SoundSource.VOICE, 1, 1);
|
||||||
living.getName().getString(), living.getDisplayName(), living.level().getServer(), living), "playsound target:headshot voice @a ~ ~ ~ 1 1");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -131,7 +155,7 @@ public class TaserBulletProjectileEntity extends AbstractArrow implements ItemSu
|
||||||
|
|
||||||
if (this.getOwner() instanceof LivingEntity source) {
|
if (this.getOwner() instanceof LivingEntity source) {
|
||||||
CompoundTag tag = source.getMainHandItem().getOrCreateTag();
|
CompoundTag tag = source.getMainHandItem().getOrCreateTag();
|
||||||
tag.putDouble("hitcount", tag.getDouble("hitcount") + 1);
|
tag.putInt("hit_count", tag.getInt("hit_count") + 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (entity instanceof Player player && !player.isCreative()) {
|
if (entity instanceof Player player && !player.isCreative()) {
|
||||||
|
@ -146,8 +170,8 @@ public class TaserBulletProjectileEntity extends AbstractArrow implements ItemSu
|
||||||
public void tick() {
|
public void tick() {
|
||||||
super.tick();
|
super.tick();
|
||||||
|
|
||||||
this.getPersistentData().putDouble("live", (this.getPersistentData().getDouble("live") + 1));
|
this.getPersistentData().putInt("live", this.getPersistentData().getInt("live") + 1);
|
||||||
if (this.getPersistentData().getDouble("live") == 5) {
|
if (this.getPersistentData().getInt("live") == 5) {
|
||||||
this.setDeltaMovement(new Vec3(0, 0, 0));
|
this.setDeltaMovement(new Vec3(0, 0, 0));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -155,33 +179,4 @@ public class TaserBulletProjectileEntity extends AbstractArrow implements ItemSu
|
||||||
this.discard();
|
this.discard();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static TaserBulletProjectileEntity shoot(Level world, LivingEntity entity, RandomSource source) {
|
|
||||||
return shoot(world, entity, source, 1f, 5, 5);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static TaserBulletProjectileEntity shoot(Level world, LivingEntity entity, RandomSource random, float power, double damage, int knockback) {
|
|
||||||
TaserBulletProjectileEntity entityarrow = new TaserBulletProjectileEntity(TargetModEntities.TASER_BULLET_PROJECTILE.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);
|
|
||||||
return entityarrow;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static TaserBulletProjectileEntity shoot(LivingEntity entity, LivingEntity target) {
|
|
||||||
TaserBulletProjectileEntity entityarrow = new TaserBulletProjectileEntity(TargetModEntities.TASER_BULLET_PROJECTILE.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);
|
|
||||||
return entityarrow;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -41,20 +41,20 @@ public class ClientEventHandler {
|
||||||
}
|
}
|
||||||
float times = 90f / fps;
|
float times = 90f / fps;
|
||||||
if (entity.getPersistentData().getDouble("move") < 0) {
|
if (entity.getPersistentData().getDouble("move") < 0) {
|
||||||
entity.getPersistentData().putDouble("move", ((entity.getPersistentData().getDouble("move") + 1 * times * Math.pow(entity.getPersistentData().getDouble("move"), 2) * (1 - 1 * entity.getPersistentData().getDouble("zoomtime")))
|
entity.getPersistentData().putDouble("move", ((entity.getPersistentData().getDouble("move") + 1 * times * Math.pow(entity.getPersistentData().getDouble("move"), 2) * (1 - 1 * entity.getPersistentData().getDouble("zoom_time")))
|
||||||
* (1 - 1 * entity.getPersistentData().getDouble("zoomtime"))));
|
* (1 - 1 * entity.getPersistentData().getDouble("zoom_time"))));
|
||||||
} else {
|
} else {
|
||||||
entity.getPersistentData().putDouble("move", ((entity.getPersistentData().getDouble("move") - 1 * times * Math.pow(entity.getPersistentData().getDouble("move"), 2) * (1 - 1 * entity.getPersistentData().getDouble("zoomtime")))
|
entity.getPersistentData().putDouble("move", ((entity.getPersistentData().getDouble("move") - 1 * times * Math.pow(entity.getPersistentData().getDouble("move"), 2) * (1 - 1 * entity.getPersistentData().getDouble("zoom_time")))
|
||||||
* (1 - 1 * entity.getPersistentData().getDouble("zoomtime"))));
|
* (1 - 1 * entity.getPersistentData().getDouble("zoom_time"))));
|
||||||
}
|
}
|
||||||
if (entity.getPersistentData().getDouble("move_right") == 1) {
|
if (entity.getPersistentData().getDouble("move_right") == 1) {
|
||||||
entity.getPersistentData().putDouble("move",
|
entity.getPersistentData().putDouble("move",
|
||||||
((entity.getPersistentData().getDouble("move") + Math.pow(Math.abs(entity.getPersistentData().getDouble("move")) + 0.05, 2) * 0.2 * times * (1 - 0.1 * entity.getPersistentData().getDouble("zoomtime")))
|
((entity.getPersistentData().getDouble("move") + Math.pow(Math.abs(entity.getPersistentData().getDouble("move")) + 0.05, 2) * 0.2 * times * (1 - 0.1 * entity.getPersistentData().getDouble("zoom_time")))
|
||||||
* (1 - 0.1 * entity.getPersistentData().getDouble("zoomtime"))));
|
* (1 - 0.1 * entity.getPersistentData().getDouble("zoom_time"))));
|
||||||
} else if (entity.getPersistentData().getDouble("move_left") == 1) {
|
} else if (entity.getPersistentData().getDouble("move_left") == 1) {
|
||||||
entity.getPersistentData().putDouble("move",
|
entity.getPersistentData().putDouble("move",
|
||||||
((entity.getPersistentData().getDouble("move") - Math.pow(Math.abs(entity.getPersistentData().getDouble("move")) + 0.05, 2) * 0.2 * times * (1 - 0.1 * entity.getPersistentData().getDouble("zoomtime")))
|
((entity.getPersistentData().getDouble("move") - Math.pow(Math.abs(entity.getPersistentData().getDouble("move")) + 0.05, 2) * 0.2 * times * (1 - 0.1 * entity.getPersistentData().getDouble("zoom_time")))
|
||||||
* (1 - 0.1 * entity.getPersistentData().getDouble("zoomtime"))));
|
* (1 - 0.1 * entity.getPersistentData().getDouble("zoom_time"))));
|
||||||
}
|
}
|
||||||
if (entity.getPersistentData().getDouble("turnr") == 1) {
|
if (entity.getPersistentData().getDouble("turnr") == 1) {
|
||||||
entity.getPersistentData().putDouble("turntimeyaw", (entity.getPersistentData().getDouble("turntimeyaw") + 0.08 * times * Math.pow(entity.getPersistentData().getDouble("amplitudeyaw"), 2)));
|
entity.getPersistentData().putDouble("turntimeyaw", (entity.getPersistentData().getDouble("turntimeyaw") + 0.08 * times * Math.pow(entity.getPersistentData().getDouble("amplitudeyaw"), 2)));
|
||||||
|
@ -90,7 +90,7 @@ public class ClientEventHandler {
|
||||||
} else {
|
} else {
|
||||||
entity.getPersistentData().putDouble("amplitudeyaw", (entity.getPersistentData().getDouble("amplitudeyaw") + 0.01 * Math.pow(entity.getPersistentData().getDouble("amplitudeyaw"), 2)));
|
entity.getPersistentData().putDouble("amplitudeyaw", (entity.getPersistentData().getDouble("amplitudeyaw") + 0.01 * Math.pow(entity.getPersistentData().getDouble("amplitudeyaw"), 2)));
|
||||||
}
|
}
|
||||||
entity.getPersistentData().putDouble("yaw", (0.04 * Math.tan(0.25 * Math.PI * entity.getPersistentData().getDouble("turntimeyaw")) * (1 - 1 * entity.getPersistentData().getDouble("zoomtime"))));
|
entity.getPersistentData().putDouble("yaw", (0.04 * Math.tan(0.25 * Math.PI * entity.getPersistentData().getDouble("turntimeyaw")) * (1 - 1 * entity.getPersistentData().getDouble("zoom_time"))));
|
||||||
if (entity.getPersistentData().getDouble("turnu") == 1) {
|
if (entity.getPersistentData().getDouble("turnu") == 1) {
|
||||||
entity.getPersistentData().putDouble("turntimepitch", (entity.getPersistentData().getDouble("turntimepitch") + 0.02 * times));
|
entity.getPersistentData().putDouble("turntimepitch", (entity.getPersistentData().getDouble("turntimepitch") + 0.02 * times));
|
||||||
}
|
}
|
||||||
|
@ -125,9 +125,9 @@ public class ClientEventHandler {
|
||||||
} else {
|
} else {
|
||||||
entity.getPersistentData().putDouble("amplitudepitch", (entity.getPersistentData().getDouble("amplitudepitch") + 0.01 * Math.pow(entity.getPersistentData().getDouble("amplitudepitch"), 2)));
|
entity.getPersistentData().putDouble("amplitudepitch", (entity.getPersistentData().getDouble("amplitudepitch") + 0.01 * Math.pow(entity.getPersistentData().getDouble("amplitudepitch"), 2)));
|
||||||
}
|
}
|
||||||
entity.getPersistentData().putDouble("gunpitch",
|
entity.getPersistentData().putDouble("gun_pitch",
|
||||||
((0.15 * entity.getPersistentData().getDouble("amplitudepitch") * Math.tan(0.25 * Math.PI * entity.getPersistentData().getDouble("turntimepitch")) * (1 - 0.8 * entity.getPersistentData().getDouble("zoomtime"))
|
((0.15 * entity.getPersistentData().getDouble("amplitudepitch") * Math.tan(0.25 * Math.PI * entity.getPersistentData().getDouble("turntimepitch")) * (1 - 0.8 * entity.getPersistentData().getDouble("zoom_time"))
|
||||||
- 0.05 * entity.getPersistentData().getDouble("vy")) * (1 - 1 * entity.getPersistentData().getDouble("zoomtime"))));
|
- 0.05 * entity.getPersistentData().getDouble("vy")) * (1 - 1 * entity.getPersistentData().getDouble("zoom_time"))));
|
||||||
if (entity.getPersistentData().getDouble("firetime") == 0) {
|
if (entity.getPersistentData().getDouble("firetime") == 0) {
|
||||||
entity.getPersistentData().putDouble("rottime", (entity.getPersistentData().getDouble("rottime") + 1));
|
entity.getPersistentData().putDouble("rottime", (entity.getPersistentData().getDouble("rottime") + 1));
|
||||||
if (entity.getPersistentData().getDouble("rottime") >= 3) {
|
if (entity.getPersistentData().getDouble("rottime") >= 3) {
|
||||||
|
@ -199,10 +199,10 @@ public class ClientEventHandler {
|
||||||
if (-0.8 < entity.getDeltaMovement().y() + 0.078 && entity.getDeltaMovement().y() + 0.078 < 0.8) {
|
if (-0.8 < entity.getDeltaMovement().y() + 0.078 && entity.getDeltaMovement().y() + 0.078 < 0.8) {
|
||||||
if (entity.getPersistentData().getDouble("vy") < entity.getDeltaMovement().y() + 0.078) {
|
if (entity.getPersistentData().getDouble("vy") < entity.getDeltaMovement().y() + 0.078) {
|
||||||
entity.getPersistentData().putDouble("vy",
|
entity.getPersistentData().putDouble("vy",
|
||||||
((entity.getPersistentData().getDouble("vy") + 2 * Math.pow((entity.getDeltaMovement().y() + 0.078) - entity.getPersistentData().getDouble("vy"), 2)) * (1 - 1 * entity.getPersistentData().getDouble("zoomtime"))));
|
((entity.getPersistentData().getDouble("vy") + 2 * Math.pow((entity.getDeltaMovement().y() + 0.078) - entity.getPersistentData().getDouble("vy"), 2)) * (1 - 1 * entity.getPersistentData().getDouble("zoom_time"))));
|
||||||
} else {
|
} else {
|
||||||
entity.getPersistentData().putDouble("vy",
|
entity.getPersistentData().putDouble("vy",
|
||||||
((entity.getPersistentData().getDouble("vy") - 2 * Math.pow((entity.getDeltaMovement().y() + 0.078) - entity.getPersistentData().getDouble("vy"), 2)) * (1 - 1 * entity.getPersistentData().getDouble("zoomtime"))));
|
((entity.getPersistentData().getDouble("vy") - 2 * Math.pow((entity.getDeltaMovement().y() + 0.078) - entity.getPersistentData().getDouble("vy"), 2)) * (1 - 1 * entity.getPersistentData().getDouble("zoom_time"))));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (entity.getPersistentData().getDouble("vy") > 0.8) {
|
if (entity.getPersistentData().getDouble("vy") > 0.8) {
|
||||||
|
@ -221,21 +221,21 @@ public class ClientEventHandler {
|
||||||
}
|
}
|
||||||
float times = 110f / fps;
|
float times = 110f / fps;
|
||||||
if ((entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
|
if ((entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
|
||||||
if (entity.getPersistentData().getDouble("zoomtime") < 1) {
|
if (entity.getPersistentData().getDouble("zoom_time") < 1) {
|
||||||
entity.getPersistentData().putDouble("zoomtime",
|
entity.getPersistentData().putDouble("zoom_time",
|
||||||
(entity.getPersistentData().getDouble("zoomtime") + entity.getMainHandItem().getOrCreateTag().getDouble("zoomspeed") * 0.02 * times));
|
(entity.getPersistentData().getDouble("zoom_time") + entity.getMainHandItem().getOrCreateTag().getDouble("zoom_firing") * 0.02 * times));
|
||||||
} else {
|
} else {
|
||||||
entity.getPersistentData().putDouble("zoomtime", 1);
|
entity.getPersistentData().putDouble("zoom_time", 1);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (entity.getPersistentData().getDouble("zoomtime") > 0) {
|
if (entity.getPersistentData().getDouble("zoom_time") > 0) {
|
||||||
entity.getPersistentData().putDouble("zoomtime", (entity.getPersistentData().getDouble("zoomtime") - 0.02 * times));
|
entity.getPersistentData().putDouble("zoom_time", (entity.getPersistentData().getDouble("zoom_time") - 0.02 * times));
|
||||||
} else {
|
} else {
|
||||||
entity.getPersistentData().putDouble("zoomtime", 0);
|
entity.getPersistentData().putDouble("zoom_time", 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
entity.getPersistentData().putDouble("zoompos", (0.5 * Math.cos(Math.PI * Math.pow(Math.pow(entity.getPersistentData().getDouble("zoomtime"), 2) - 1, 2)) + 0.5));
|
entity.getPersistentData().putDouble("zoom_pos", (0.5 * Math.cos(Math.PI * Math.pow(Math.pow(entity.getPersistentData().getDouble("zoom_time"), 2) - 1, 2)) + 0.5));
|
||||||
entity.getPersistentData().putDouble("zoomposz", (-Math.pow(2 * entity.getPersistentData().getDouble("zoomtime") - 1, 2) + 1));
|
entity.getPersistentData().putDouble("zoom_pos_z", (-Math.pow(2 * entity.getPersistentData().getDouble("zoom_time") - 1, 2) + 1));
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void handleWeaponFire(ViewportEvent.ComputeCameraAngles event, LivingEntity entity) {
|
private static void handleWeaponFire(ViewportEvent.ComputeCameraAngles event, LivingEntity entity) {
|
||||||
|
@ -255,9 +255,10 @@ public class ClientEventHandler {
|
||||||
float times = 45f / fps;
|
float times = 45f / fps;
|
||||||
amplitude = 15000 * stack.getOrCreateTag().getDouble("recoily")
|
amplitude = 15000 * stack.getOrCreateTag().getDouble("recoily")
|
||||||
* stack.getOrCreateTag().getDouble("recoilx");
|
* stack.getOrCreateTag().getDouble("recoilx");
|
||||||
if (entity.isShiftKeyDown() && entity.getBbHeight() >= 1 && entity.getPersistentData().getDouble("prone") == 0) {
|
var data = entity.getPersistentData();
|
||||||
|
if (entity.isShiftKeyDown() && entity.getBbHeight() >= 1 && data.getDouble("prone") == 0) {
|
||||||
pose = 0.9;
|
pose = 0.9;
|
||||||
} else if (entity.getPersistentData().getDouble("prone") > 0) {
|
} else if (data.getDouble("prone") > 0) {
|
||||||
if (stack.getOrCreateTag().getDouble("bipod") == 1) {
|
if (stack.getOrCreateTag().getDouble("bipod") == 1) {
|
||||||
pose = 0.75;
|
pose = 0.75;
|
||||||
} else {
|
} else {
|
||||||
|
@ -267,54 +268,55 @@ public class ClientEventHandler {
|
||||||
pose = 1;
|
pose = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).firing > 0) {
|
var capability = entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null);
|
||||||
entity.getPersistentData().putDouble("firetime", 0.2);
|
if (capability.orElse(new TargetModVariables.PlayerVariables()).firing > 0) {
|
||||||
if (0.3 > entity.getPersistentData().getDouble("firepos2")) {
|
data.putDouble("firetime", 0.2);
|
||||||
entity.getPersistentData().putDouble("firepos2", (entity.getPersistentData().getDouble("firepos2") + 0.04 * times));
|
if (0.3 > data.getDouble("firepos2")) {
|
||||||
|
data.putDouble("firepos2", (data.getDouble("firepos2") + 0.04 * times));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (0 < entity.getPersistentData().getDouble("firepos2")) {
|
if (0 < data.getDouble("firepos2")) {
|
||||||
entity.getPersistentData().putDouble("firepos2", (entity.getPersistentData().getDouble("firepos2") - 0.02 * times));
|
data.putDouble("firepos2", (data.getDouble("firepos2") - 0.02 * times));
|
||||||
} else {
|
} else {
|
||||||
entity.getPersistentData().putDouble("firepos2", 0);
|
data.putDouble("firepos2", 0);
|
||||||
}
|
}
|
||||||
if (0 < entity.getPersistentData().getDouble("firetime")) {
|
if (0 < data.getDouble("firetime")) {
|
||||||
entity.getPersistentData().putDouble("firetime", (entity.getPersistentData().getDouble("firetime") + 0.075 * times));
|
data.putDouble("firetime", (data.getDouble("firetime") + 0.075 * times));
|
||||||
}
|
}
|
||||||
if (0 < entity.getPersistentData().getDouble("firetime") && entity.getPersistentData().getDouble("firetime") < 0.2) {
|
if (0 < data.getDouble("firetime") && data.getDouble("firetime") < 0.2) {
|
||||||
entity.getPersistentData().putDouble("firepos",
|
data.putDouble("fire_pos",
|
||||||
(pose * ((-18.34) * Math.pow(entity.getPersistentData().getDouble("firetime"), 2) + 8.58 * entity.getPersistentData().getDouble("firetime") + entity.getPersistentData().getDouble("firepos2"))));
|
(pose * ((-18.34) * Math.pow(data.getDouble("firetime"), 2) + 8.58 * data.getDouble("firetime") + data.getDouble("firepos2"))));
|
||||||
if ((entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon == 1) {
|
if ((capability.orElse(new TargetModVariables.PlayerVariables())).recoilHorizon == 1) {
|
||||||
event.setYaw((float) (yaw - 0.2 * amplitude * ((-18.34) * Math.pow(entity.getPersistentData().getDouble("firetime"), 2) + 8.58 * entity.getPersistentData().getDouble("firetime") + 0.7 * (2 * Math.random() - 1))));
|
event.setYaw((float) (yaw - 0.2 * amplitude * ((-18.34) * Math.pow(data.getDouble("firetime"), 2) + 8.58 * data.getDouble("firetime") + 0.7 * (2 * Math.random() - 1))));
|
||||||
event.setPitch((float) (pitch + 0.2 * amplitude * ((-18.34) * Math.pow(entity.getPersistentData().getDouble("firetime"), 2) + 8.58 * entity.getPersistentData().getDouble("firetime") + 0.7 * (2 * Math.random() - 1))));
|
event.setPitch((float) (pitch + 0.2 * amplitude * ((-18.34) * Math.pow(data.getDouble("firetime"), 2) + 8.58 * data.getDouble("firetime") + 0.7 * (2 * Math.random() - 1))));
|
||||||
event.setRoll((float) (roll + amplitude * ((-18.34) * Math.pow(entity.getPersistentData().getDouble("firetime"), 2) + 8.58 * entity.getPersistentData().getDouble("firetime") + 0.7 * (2 * Math.random() - 1))));
|
event.setRoll((float) (roll + amplitude * ((-18.34) * Math.pow(data.getDouble("firetime"), 2) + 8.58 * data.getDouble("firetime") + 0.7 * (2 * Math.random() - 1))));
|
||||||
} else if ((entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon == -1) {
|
} else if ((capability.orElse(new TargetModVariables.PlayerVariables())).recoilHorizon == -1) {
|
||||||
event.setYaw((float) (yaw - 0.2 * amplitude * ((-18.34) * Math.pow(entity.getPersistentData().getDouble("firetime"), 2) + 8.58 * entity.getPersistentData().getDouble("firetime") + 0.7 * (2 * Math.random() - 1))));
|
event.setYaw((float) (yaw - 0.2 * amplitude * ((-18.34) * Math.pow(data.getDouble("firetime"), 2) + 8.58 * data.getDouble("firetime") + 0.7 * (2 * Math.random() - 1))));
|
||||||
event.setPitch((float) (pitch + 0.2 * amplitude * ((-18.34) * Math.pow(entity.getPersistentData().getDouble("firetime"), 2) + 8.58 * entity.getPersistentData().getDouble("firetime") + 0.7 * (2 * Math.random() - 1))));
|
event.setPitch((float) (pitch + 0.2 * amplitude * ((-18.34) * Math.pow(data.getDouble("firetime"), 2) + 8.58 * data.getDouble("firetime") + 0.7 * (2 * Math.random() - 1))));
|
||||||
event.setRoll((float) (roll - amplitude * ((-18.34) * Math.pow(entity.getPersistentData().getDouble("firetime"), 2) + 8.58 * entity.getPersistentData().getDouble("firetime") + 0.7 * (2 * Math.random() - 1))));
|
event.setRoll((float) (roll - amplitude * ((-18.34) * Math.pow(data.getDouble("firetime"), 2) + 8.58 * data.getDouble("firetime") + 0.7 * (2 * Math.random() - 1))));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (0.2 <= entity.getPersistentData().getDouble("firetime") && entity.getPersistentData().getDouble("firetime") < 1) {
|
if (0.2 <= data.getDouble("firetime") && data.getDouble("firetime") < 1) {
|
||||||
entity.getPersistentData().putDouble("firepos",
|
data.putDouble("fire_pos",
|
||||||
(pose * (3.34 * Math.pow(entity.getPersistentData().getDouble("firetime"), 2) - 5.5 * entity.getPersistentData().getDouble("firetime") + 2.167 + entity.getPersistentData().getDouble("firepos2"))));
|
(pose * (3.34 * Math.pow(data.getDouble("firetime"), 2) - 5.5 * data.getDouble("firetime") + 2.167 + data.getDouble("firepos2"))));
|
||||||
if ((entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon == 1) {
|
if ((capability.orElse(new TargetModVariables.PlayerVariables())).recoilHorizon == 1) {
|
||||||
event.setYaw((float) (yaw - 0.2 * amplitude * (3.34 * Math.pow(entity.getPersistentData().getDouble("firetime"), 2) - 5.5 * entity.getPersistentData().getDouble("firetime") + 2.167 + 0.7 * (2 * Math.random() - 1))));
|
event.setYaw((float) (yaw - 0.2 * amplitude * (3.34 * Math.pow(data.getDouble("firetime"), 2) - 5.5 * data.getDouble("firetime") + 2.167 + 0.7 * (2 * Math.random() - 1))));
|
||||||
event.setPitch((float) (pitch + 0.2 * amplitude * (3.34 * Math.pow(entity.getPersistentData().getDouble("firetime"), 2) - 5.5 * entity.getPersistentData().getDouble("firetime") + 2.167 + 0.7 * (2 * Math.random() - 1))));
|
event.setPitch((float) (pitch + 0.2 * amplitude * (3.34 * Math.pow(data.getDouble("firetime"), 2) - 5.5 * data.getDouble("firetime") + 2.167 + 0.7 * (2 * Math.random() - 1))));
|
||||||
event.setRoll((float) (roll + amplitude * (3.34 * Math.pow(entity.getPersistentData().getDouble("firetime"), 2) - 5.5 * entity.getPersistentData().getDouble("firetime") + 2.167 + 0.7 * (2 * Math.random() - 1))));
|
event.setRoll((float) (roll + amplitude * (3.34 * Math.pow(data.getDouble("firetime"), 2) - 5.5 * data.getDouble("firetime") + 2.167 + 0.7 * (2 * Math.random() - 1))));
|
||||||
} else if ((entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon == -1) {
|
} else if ((capability.orElse(new TargetModVariables.PlayerVariables())).recoilHorizon == -1) {
|
||||||
event.setYaw((float) (yaw + 0.2 * amplitude * (3.34 * Math.pow(entity.getPersistentData().getDouble("firetime"), 2) - 5.5 * entity.getPersistentData().getDouble("firetime") + 2.167 + 0.7 * (2 * Math.random() - 1))));
|
event.setYaw((float) (yaw + 0.2 * amplitude * (3.34 * Math.pow(data.getDouble("firetime"), 2) - 5.5 * data.getDouble("firetime") + 2.167 + 0.7 * (2 * Math.random() - 1))));
|
||||||
event.setPitch((float) (pitch - 0.2 * amplitude * (3.34 * Math.pow(entity.getPersistentData().getDouble("firetime"), 2) - 5.5 * entity.getPersistentData().getDouble("firetime") + 2.167 + 0.7 * (2 * Math.random() - 1))));
|
event.setPitch((float) (pitch - 0.2 * amplitude * (3.34 * Math.pow(data.getDouble("firetime"), 2) - 5.5 * data.getDouble("firetime") + 2.167 + 0.7 * (2 * Math.random() - 1))));
|
||||||
event.setRoll((float) (roll - amplitude * (3.34 * Math.pow(entity.getPersistentData().getDouble("firetime"), 2) - 5.5 * entity.getPersistentData().getDouble("firetime") + 2.167 + 0.7 * (2 * Math.random() - 1))));
|
event.setRoll((float) (roll - amplitude * (3.34 * Math.pow(data.getDouble("firetime"), 2) - 5.5 * data.getDouble("firetime") + 2.167 + 0.7 * (2 * Math.random() - 1))));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (0 <= entity.getPersistentData().getDouble("firetime") && entity.getPersistentData().getDouble("firetime") <= 0.25) {
|
if (0 <= data.getDouble("firetime") && data.getDouble("firetime") <= 0.25) {
|
||||||
entity.getPersistentData().putDouble("boltpos", (-Math.pow(8 * entity.getPersistentData().getDouble("firetime") - 1, 2) + 1));
|
data.putDouble("boltpos", (-Math.pow(8 * data.getDouble("firetime") - 1, 2) + 1));
|
||||||
}
|
}
|
||||||
if (0.25 < entity.getPersistentData().getDouble("firetime") && entity.getPersistentData().getDouble("firetime") < 1) {
|
if (0.25 < data.getDouble("firetime") && data.getDouble("firetime") < 1) {
|
||||||
entity.getPersistentData().putDouble("boltpos", 0);
|
data.putDouble("boltpos", 0);
|
||||||
}
|
}
|
||||||
if (entity.getPersistentData().getDouble("firetime") >= 1) {
|
if (data.getDouble("firetime") >= 1) {
|
||||||
entity.getPersistentData().putDouble("firetime", 0);
|
data.putDouble("firetime", 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -60,7 +60,7 @@ public class GunEventHandler {
|
||||||
double sneaking = player.isShiftKeyDown() ? (-0.25) * basic : 0;
|
double sneaking = player.isShiftKeyDown() ? (-0.25) * basic : 0;
|
||||||
double prone = player.getPersistentData().getDouble("prone") > 0 ? (-0.5) * basic : 0;
|
double prone = player.getPersistentData().getDouble("prone") > 0 ? (-0.5) * basic : 0;
|
||||||
double jump = player.onGround() ? 0 : 1.5 * basic;
|
double jump = player.onGround() ? 0 : 1.5 * basic;
|
||||||
double fire = stack.getOrCreateTag().getDouble("fireanim") > 0 ? 0.5 * basic : 0;
|
double fire = stack.getOrCreateTag().getInt("fire_animation") > 0 ? 0.5 * basic : 0;
|
||||||
double ride = player.isPassenger() ? (-0.5) * basic : 0;
|
double ride = player.isPassenger() ? (-0.5) * basic : 0;
|
||||||
|
|
||||||
double walk;
|
double walk;
|
||||||
|
@ -111,13 +111,13 @@ public class GunEventHandler {
|
||||||
private static void handleGunFire(Player player) {
|
private static void handleGunFire(Player player) {
|
||||||
ItemStack stack = player.getMainHandItem();
|
ItemStack stack = player.getMainHandItem();
|
||||||
if (stack.is(TargetModTags.Items.NORMAL_GUN)) {
|
if (stack.is(TargetModTags.Items.NORMAL_GUN)) {
|
||||||
double mode = stack.getOrCreateTag().getInt("firemode");
|
double mode = stack.getOrCreateTag().getInt("fire_mode");
|
||||||
if (player.getPersistentData().getDouble("firing") == 0 && player.getMainHandItem().getItem() == TargetModItems.DEVOTION.get()) {
|
if (!player.getPersistentData().getBoolean("firing") && player.getMainHandItem().getItem() == TargetModItems.DEVOTION.get()) {
|
||||||
stack.getOrCreateTag().putDouble("fire_increase", 0);
|
stack.getOrCreateTag().putDouble("fire_increase", 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (player.getPersistentData().getDouble("firing") == 1
|
if (player.getPersistentData().getBoolean("firing")
|
||||||
&& stack.getOrCreateTag().getDouble("reloading") == 0
|
&& !stack.getOrCreateTag().getBoolean("reloading")
|
||||||
&& stack.getOrCreateTag().getInt("ammo") > 0
|
&& stack.getOrCreateTag().getInt("ammo") > 0
|
||||||
&& !player.getCooldowns().isOnCooldown(stack.getItem())
|
&& !player.getCooldowns().isOnCooldown(stack.getItem())
|
||||||
&& mode != 1
|
&& mode != 1
|
||||||
|
@ -125,8 +125,8 @@ public class GunEventHandler {
|
||||||
|
|
||||||
playGunSounds(player);
|
playGunSounds(player);
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getInt("firemode") == 0) {
|
if (stack.getOrCreateTag().getInt("fire_mode") == 0) {
|
||||||
player.getPersistentData().putDouble("firing", 0);
|
player.getPersistentData().putBoolean("firing", false);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("animindex") == 1) {
|
if (stack.getOrCreateTag().getDouble("animindex") == 1) {
|
||||||
|
@ -146,7 +146,7 @@ public class GunEventHandler {
|
||||||
}
|
}
|
||||||
|
|
||||||
stack.getOrCreateTag().putInt("ammo", (stack.getOrCreateTag().getInt("ammo") - 1));
|
stack.getOrCreateTag().putInt("ammo", (stack.getOrCreateTag().getInt("ammo") - 1));
|
||||||
stack.getOrCreateTag().putDouble("fireanim", stack.getOrCreateTag().getDouble("fire_interval"));
|
stack.getOrCreateTag().putInt("fire_animation", stack.getOrCreateTag().getInt("fire_interval"));
|
||||||
stack.getOrCreateTag().putDouble("flash_time", 2);
|
stack.getOrCreateTag().putDouble("flash_time", 2);
|
||||||
stack.getOrCreateTag().putDouble("empty", 1);
|
stack.getOrCreateTag().putDouble("empty", 1);
|
||||||
|
|
||||||
|
@ -198,7 +198,7 @@ public class GunEventHandler {
|
||||||
/**
|
/**
|
||||||
* 在开火动画的最后1tick,设置需要拉栓上膛的武器拉栓动画的倒计时为data里的拉栓时间
|
* 在开火动画的最后1tick,设置需要拉栓上膛的武器拉栓动画的倒计时为data里的拉栓时间
|
||||||
*/
|
*/
|
||||||
if (stack.getOrCreateTag().getDouble("fireanim") == 1 && stack.getOrCreateTag().getDouble("need_bolt_action") == 1) {
|
if (stack.getOrCreateTag().getInt("fire_animation") == 1 && stack.getOrCreateTag().getDouble("need_bolt_action") == 1) {
|
||||||
stack.getOrCreateTag().putDouble("bolt_action_anim", stack.getOrCreateTag().getDouble("bolt_action_time"));
|
stack.getOrCreateTag().putDouble("bolt_action_anim", stack.getOrCreateTag().getDouble("bolt_action_time"));
|
||||||
player.getCooldowns().addCooldown(stack.getItem(), (int) stack.getOrCreateTag().getDouble("bolt_action_time"));
|
player.getCooldowns().addCooldown(stack.getItem(), (int) stack.getOrCreateTag().getDouble("bolt_action_time"));
|
||||||
playGunBoltSounds(player);
|
playGunBoltSounds(player);
|
||||||
|
|
|
@ -198,7 +198,7 @@ public class LivingEntityEventHandler {
|
||||||
capability.syncPlayerVariables(player);
|
capability.syncPlayerVariables(player);
|
||||||
});
|
});
|
||||||
|
|
||||||
player.getPersistentData().putDouble("zoompos", 0);
|
player.getPersistentData().putDouble("zoom_pos", 0);
|
||||||
player.getPersistentData().putDouble("zoom_time", 0);
|
player.getPersistentData().putDouble("zoom_time", 0);
|
||||||
if (newStack.getOrCreateTag().getDouble("bolt_action_time") > 0) {
|
if (newStack.getOrCreateTag().getDouble("bolt_action_time") > 0) {
|
||||||
newStack.getOrCreateTag().putDouble("bolt_action_anim", 0);
|
newStack.getOrCreateTag().putDouble("bolt_action_anim", 0);
|
||||||
|
|
|
@ -101,7 +101,7 @@ public class PlayerEventHandler {
|
||||||
* 判断玩家是否在奔跑
|
* 判断玩家是否在奔跑
|
||||||
*/
|
*/
|
||||||
private static void handlePlayerSprint(Player player) {
|
private static void handlePlayerSprint(Player player) {
|
||||||
if (player.getMainHandItem().getOrCreateTag().getDouble("fireanim") > 0) {
|
if (player.getMainHandItem().getOrCreateTag().getInt("fire_animation") > 0) {
|
||||||
player.getPersistentData().putDouble("noRun", 20);
|
player.getPersistentData().putDouble("noRun", 20);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -124,17 +124,18 @@ public class PlayerEventHandler {
|
||||||
private static void handleWeaponLevel(Player player) {
|
private static void handleWeaponLevel(Player player) {
|
||||||
ItemStack stack = player.getMainHandItem();
|
ItemStack stack = player.getMainHandItem();
|
||||||
if (stack.is(TargetModTags.Items.GUN)) {
|
if (stack.is(TargetModTags.Items.GUN)) {
|
||||||
if (stack.getOrCreateTag().getDouble("level") == 0) {
|
var tag = stack.getOrCreateTag();
|
||||||
stack.getOrCreateTag().putDouble("exp2", 20);
|
if (tag.getInt("level") == 0) {
|
||||||
|
tag.putDouble("exp2", 20);
|
||||||
} else {
|
} else {
|
||||||
stack.getOrCreateTag().putDouble("exp2", (stack.getOrCreateTag().getDouble("exp1") + stack.getOrCreateTag().getDouble("level") * 500));
|
tag.putDouble("exp2", (tag.getDouble("exp1") + tag.getInt("level") * 500));
|
||||||
}
|
}
|
||||||
if (stack.getOrCreateTag().getDouble("damagetotal") >= stack.getOrCreateTag().getDouble("exp2")) {
|
if (tag.getDouble("damagetotal") >= tag.getDouble("exp2")) {
|
||||||
stack.getOrCreateTag().putDouble("exp1", (stack.getOrCreateTag().getDouble("exp2")));
|
tag.putDouble("exp1", (tag.getDouble("exp2")));
|
||||||
stack.getOrCreateTag().putDouble("level", (stack.getOrCreateTag().getDouble("level") + 1));
|
tag.putInt("level", tag.getInt("level") + 1);
|
||||||
}
|
}
|
||||||
stack.getOrCreateTag().putDouble("damagenow", (stack.getOrCreateTag().getDouble("damagetotal") - stack.getOrCreateTag().getDouble("exp1")));
|
tag.putDouble("damagenow", (tag.getDouble("damagetotal") - tag.getDouble("exp1")));
|
||||||
stack.getOrCreateTag().putDouble("damageneed", (stack.getOrCreateTag().getDouble("exp2") - stack.getOrCreateTag().getDouble("exp1")));
|
tag.putDouble("damageneed", (tag.getDouble("exp2") - tag.getDouble("exp1")));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -149,9 +150,10 @@ public class PlayerEventHandler {
|
||||||
if (player == null)
|
if (player == null)
|
||||||
return;
|
return;
|
||||||
double pose;
|
double pose;
|
||||||
if (player.isShiftKeyDown() && player.getBbHeight() >= 1 && player.getPersistentData().getDouble("prone") == 0) {
|
var data = player.getPersistentData();
|
||||||
|
if (player.isShiftKeyDown() && player.getBbHeight() >= 1 && data.getDouble("prone") == 0) {
|
||||||
pose = 0.85;
|
pose = 0.85;
|
||||||
} else if (player.getPersistentData().getDouble("prone") > 0) {
|
} else if (data.getDouble("prone") > 0) {
|
||||||
if (player.getMainHandItem().getOrCreateTag().getDouble("bipod") == 1) {
|
if (player.getMainHandItem().getOrCreateTag().getDouble("bipod") == 1) {
|
||||||
pose = 0;
|
pose = 0;
|
||||||
} else {
|
} else {
|
||||||
|
@ -160,9 +162,9 @@ public class PlayerEventHandler {
|
||||||
} else {
|
} else {
|
||||||
pose = 1;
|
pose = 1;
|
||||||
}
|
}
|
||||||
player.getPersistentData().putDouble("time", (player.getPersistentData().getDouble("time") + 0.015));
|
data.putDouble("time", (data.getDouble("time") + 0.015));
|
||||||
player.getPersistentData().putDouble("x", (pose * (-0.008) * Math.sin(1 * player.getPersistentData().getDouble("time")) * (1 - 0.9 * player.getPersistentData().getDouble("zoomtime"))));
|
data.putDouble("x", (pose * -0.008 * Math.sin(data.getDouble("time")) * (1 - 0.9 * data.getDouble("zoom_time"))));
|
||||||
player.getPersistentData().putDouble("y", (pose * 0.125 * Math.sin(player.getPersistentData().getDouble("time") - 1.585) * (1 - 0.9 * player.getPersistentData().getDouble("zoomtime"))));
|
data.putDouble("y", (pose * 0.125 * Math.sin(data.getDouble("time") - 1.585) * (1 - 0.9 * data.getDouble("zoom_time"))));
|
||||||
|
|
||||||
recoilTimer[0]++;
|
recoilTimer[0]++;
|
||||||
try {
|
try {
|
||||||
|
@ -180,7 +182,7 @@ public class PlayerEventHandler {
|
||||||
public static String handleAmmoCount(Player player) {
|
public static String handleAmmoCount(Player player) {
|
||||||
ItemStack stack = player.getMainHandItem();
|
ItemStack stack = player.getMainHandItem();
|
||||||
|
|
||||||
String firemode = switch (stack.getOrCreateTag().getInt("firemode")) {
|
String firemode = switch (stack.getOrCreateTag().getInt("fire_mode")) {
|
||||||
case 0 -> "Semi";
|
case 0 -> "Semi";
|
||||||
case 1 -> "Burst";
|
case 1 -> "Burst";
|
||||||
case 2 -> "Auto";
|
case 2 -> "Auto";
|
||||||
|
@ -261,7 +263,7 @@ public class PlayerEventHandler {
|
||||||
private static void handlePrepareZoom(Player player) {
|
private static void handlePrepareZoom(Player player) {
|
||||||
ItemStack stack = player.getMainHandItem();
|
ItemStack stack = player.getMainHandItem();
|
||||||
|
|
||||||
if (stack.is(TargetModTags.Items.GUN) && stack.getOrCreateTag().getDouble("reloading") != 1 && !player.isSpectator()) {
|
if (stack.is(TargetModTags.Items.GUN) && !stack.getOrCreateTag().getBoolean("reloading") && !player.isSpectator()) {
|
||||||
if (player.getMainHandItem().getItem() != TargetModItems.MINIGUN.get()) {
|
if (player.getMainHandItem().getItem() != TargetModItems.MINIGUN.get()) {
|
||||||
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zoom) {
|
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zoom) {
|
||||||
player.setSprinting(false);
|
player.setSprinting(false);
|
||||||
|
@ -270,11 +272,11 @@ public class PlayerEventHandler {
|
||||||
capability.syncPlayerVariables(player);
|
capability.syncPlayerVariables(player);
|
||||||
});
|
});
|
||||||
|
|
||||||
if (player.getPersistentData().getDouble("zoom_time") < 10) {
|
if (player.getPersistentData().getInt("zoom_time") < 10) {
|
||||||
player.getPersistentData().putDouble("zoom_time", (player.getPersistentData().getDouble("zoom_time") + 1));
|
player.getPersistentData().putInt("zoom_time", player.getPersistentData().getInt("zoom_time") + 1);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
player.getPersistentData().putDouble("zoom_time", 0);
|
player.getPersistentData().putInt("zoom_time", 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -332,13 +334,9 @@ public class PlayerEventHandler {
|
||||||
if (player == null) return;
|
if (player == null) return;
|
||||||
|
|
||||||
player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
|
player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
|
||||||
var headIndicator = player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).map(c -> c.headIndicator).orElse(0d);
|
capability.headIndicator = Math.max(0, capability.headIndicator - 1);
|
||||||
var hitIndicator = player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).map(c -> c.hitIndicator).orElse(0d);
|
capability.hitIndicator = Math.max(0, capability.hitIndicator - 1);
|
||||||
var killIndicator = player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).map(c -> c.killIndicator).orElse(0d);
|
capability.killIndicator = Math.max(0, capability.killIndicator - 1);
|
||||||
|
|
||||||
capability.headIndicator = Math.max(0, headIndicator - 1);
|
|
||||||
capability.hitIndicator = Math.max(0, hitIndicator - 1);
|
|
||||||
capability.killIndicator = Math.max(0, killIndicator - 1);
|
|
||||||
|
|
||||||
capability.syncPlayerVariables(player);
|
capability.syncPlayerVariables(player);
|
||||||
});
|
});
|
||||||
|
|
|
@ -26,9 +26,9 @@ public class ItemAnimationFactory {
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void setAnimationState(ItemStack itemStack, boolean isClientSide) {
|
private static void setAnimationState(ItemStack itemStack, boolean isClientSide) {
|
||||||
if (!itemStack.getOrCreateTag().getString("geckoAnim").isEmpty() && !(itemStack.getItem() instanceof ArmorItem)) {
|
if (!itemStack.getOrCreateTag().getString("gecko_animation").isEmpty() && !(itemStack.getItem() instanceof ArmorItem)) {
|
||||||
String animation = itemStack.getOrCreateTag().getString("geckoAnim");
|
String animation = itemStack.getOrCreateTag().getString("gecko_animation");
|
||||||
itemStack.getOrCreateTag().putString("geckoAnim", "");
|
itemStack.getOrCreateTag().putString("gecko_animation", "");
|
||||||
|
|
||||||
if (itemStack.getItem() instanceof AnimatedItem animatable && isClientSide) {
|
if (itemStack.getItem() instanceof AnimatedItem animatable && isClientSide) {
|
||||||
animatable.setAnimationProcedure(animation);
|
animatable.setAnimationProcedure(animation);
|
||||||
|
|
|
@ -86,23 +86,23 @@ public class AK47Item extends GunItem implements GeoItem, AnimatedItem {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ak47.draw"));
|
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ak47.draw"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("fireanim") > 0) {
|
if (stack.getOrCreateTag().getInt("fire_animation") > 0) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.fire"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.fire"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("reloading") == 1 && stack.getOrCreateTag().getDouble("emptyreload") == 1) {
|
if (stack.getOrCreateTag().getBoolean("reloading") && stack.getOrCreateTag().getBoolean("empty_reload")) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.reload"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.reload"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("reloading") == 1 && stack.getOrCreateTag().getDouble("emptyreload") == 0) {
|
if (stack.getOrCreateTag().getBoolean("reloading") && !stack.getOrCreateTag().getBoolean("empty_reload")) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.reload2"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.reload2"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getInt("firemode") == 0 && stack.getOrCreateTag().getDouble("cg") > 0) {
|
if (stack.getOrCreateTag().getInt("fire_mode") == 0 && stack.getOrCreateTag().getDouble("cg") > 0) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.changefirerate2"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.changefirerate2"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getInt("firemode") == 2 && stack.getOrCreateTag().getDouble("cg") > 0) {
|
if (stack.getOrCreateTag().getInt("fire_mode") == 2 && stack.getOrCreateTag().getDouble("cg") > 0) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.changefirerate"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.changefirerate"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -86,23 +86,23 @@ public class Aa12Item extends GunItem implements GeoItem, AnimatedItem {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.aa12.draw"));
|
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.aa12.draw"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("fireanim") > 0) {
|
if (stack.getOrCreateTag().getInt("fire_animation") > 0) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.aa12.fire"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.aa12.fire"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("reloading") == 1 && stack.getOrCreateTag().getDouble("emptyreload") == 1) {
|
if (stack.getOrCreateTag().getBoolean("reloading") && stack.getOrCreateTag().getBoolean("empty_reload")) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.aa12.reloadempty"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.aa12.reloadempty"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("reloading") == 1 && stack.getOrCreateTag().getDouble("emptyreload") == 0) {
|
if (stack.getOrCreateTag().getBoolean("reloading") && !stack.getOrCreateTag().getBoolean("empty_reload")) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.aa12.reload"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.aa12.reload"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getInt("firemode") == 0 && stack.getOrCreateTag().getDouble("cg") > 0) {
|
if (stack.getOrCreateTag().getInt("fire_mode") == 0 && stack.getOrCreateTag().getDouble("cg") > 0) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.aa12.changefirerate2"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.aa12.changefirerate2"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getInt("firemode") == 2 && stack.getOrCreateTag().getDouble("cg") > 0) {
|
if (stack.getOrCreateTag().getInt("fire_mode") == 2 && stack.getOrCreateTag().getDouble("cg") > 0) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.aa12.changefirerate"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.aa12.changefirerate"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -87,15 +87,15 @@ public class Abekiri extends GunItem implements GeoItem, AnimatedItem {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ab.draw"));
|
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ab.draw"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("fireanim") > 0) {
|
if (stack.getOrCreateTag().getInt("fire_animation") > 0) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ab.fire"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ab.fire"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("reloading") == 1 && stack.getOrCreateTag().getDouble("emptyreload") == 1) {
|
if (stack.getOrCreateTag().getBoolean("reloading") && stack.getOrCreateTag().getBoolean("empty_reload")) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ab.reload2"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ab.reload2"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("reloading") == 1 && stack.getOrCreateTag().getDouble("emptyreload") == 0) {
|
if (stack.getOrCreateTag().getBoolean("reloading") && !stack.getOrCreateTag().getBoolean("empty_reload")) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ab.reload"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ab.reload"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -161,8 +161,8 @@ public class BocekItem extends GunItem implements GeoItem, AnimatedItem {
|
||||||
|
|
||||||
// TODO 合并至GunReload
|
// TODO 合并至GunReload
|
||||||
CompoundTag tag = itemstack.getOrCreateTag();
|
CompoundTag tag = itemstack.getOrCreateTag();
|
||||||
if (tag.getDouble("arrowempty") > 0) {
|
if (tag.getInt("arrow_empty") > 0) {
|
||||||
tag.putDouble("arrowempty", tag.getDouble("arrowempty") - 1);
|
tag.putInt("arrow_empty", tag.getInt("arrow_empty") - 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -86,15 +86,15 @@ public class Devotion extends GunItem implements GeoItem, AnimatedItem {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.devotion.draw"));
|
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.devotion.draw"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("fireanim") > 0) {
|
if (stack.getOrCreateTag().getInt("fire_animation") > 0) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.devotion.fire"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.devotion.fire"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("reloading") == 1 && stack.getOrCreateTag().getDouble("emptyreload") == 1) {
|
if (stack.getOrCreateTag().getBoolean("reloading") && stack.getOrCreateTag().getBoolean("empty_reload")) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.devotion.reload"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.devotion.reload"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("reloading") == 1 && stack.getOrCreateTag().getDouble("emptyreload") == 0) {
|
if (stack.getOrCreateTag().getBoolean("reloading") && !stack.getOrCreateTag().getBoolean("empty_reload")) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.devotion.reload2"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.devotion.reload2"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -170,12 +170,12 @@ public class Devotion extends GunItem implements GeoItem, AnimatedItem {
|
||||||
var mainHandItemTag = mainHandItem.getOrCreateTag();
|
var mainHandItemTag = mainHandItem.getOrCreateTag();
|
||||||
|
|
||||||
if (mainHandItemTag.getDouble("id") != itemTag.getDouble("id")) {
|
if (mainHandItemTag.getDouble("id") != itemTag.getDouble("id")) {
|
||||||
itemTag.putDouble("emptyreload", 0);
|
itemTag.putBoolean("empty_reload", false);
|
||||||
itemTag.putDouble("reloading", 0);
|
itemTag.putBoolean("reloading", false);
|
||||||
itemTag.putDouble("reloadtime", 0);
|
itemTag.putDouble("reloading_time", 0);
|
||||||
}
|
}
|
||||||
if (itemTag.getDouble("reloading") == 1 && itemTag.getInt("ammo") == 0) {
|
if (itemTag.getBoolean("reloading") && itemTag.getInt("ammo") == 0) {
|
||||||
if (itemTag.getDouble("reloadtime") == 71) {
|
if (itemTag.getDouble("reloading_time") == 71) {
|
||||||
entity.getPersistentData().putDouble("id", id);
|
entity.getPersistentData().putDouble("id", id);
|
||||||
if (!entity.level().isClientSide() && entity.getServer() != null) {
|
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,
|
entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4,
|
||||||
|
@ -184,19 +184,19 @@ public class Devotion extends GunItem implements GeoItem, AnimatedItem {
|
||||||
}
|
}
|
||||||
if (mainHandItem.getItem() == itemstack.getItem()
|
if (mainHandItem.getItem() == itemstack.getItem()
|
||||||
&& mainHandItemTag.getDouble("id") == id) {
|
&& mainHandItemTag.getDouble("id") == id) {
|
||||||
if (itemTag.getDouble("reloadtime") > 0) {
|
if (itemTag.getDouble("reloading_time") > 0) {
|
||||||
itemTag.putDouble("reloadtime", itemTag.getDouble("reloadtime") - 1);
|
itemTag.putDouble("reloading_time", itemTag.getDouble("reloading_time") - 1);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
itemTag.putDouble("reloading", 0);
|
itemTag.putBoolean("reloading", false);
|
||||||
itemTag.putDouble("emptyreload", 0);
|
itemTag.putBoolean("empty_reload", false);
|
||||||
itemTag.putDouble("reloadtime", 0);
|
itemTag.putDouble("reloading_time", 0);
|
||||||
}
|
}
|
||||||
if (itemTag.getDouble("reloadtime") == 1 && mainHandItemTag.getDouble("id") == id) {
|
if (itemTag.getDouble("reloading_time") == 1 && mainHandItemTag.getDouble("id") == id) {
|
||||||
GunReload.reload(entity, GunInfo.Type.RIFLE);
|
GunReload.reload(entity, GunInfo.Type.RIFLE);
|
||||||
}
|
}
|
||||||
} else if (itemTag.getDouble("reloading") == 1 && itemTag.getInt("ammo") > 0) {
|
} else if (itemTag.getBoolean("reloading") && itemTag.getInt("ammo") > 0) {
|
||||||
if (itemTag.getDouble("reloadtime") == 51) {
|
if (itemTag.getDouble("reloading_time") == 51) {
|
||||||
entity.getPersistentData().putDouble("id", id);
|
entity.getPersistentData().putDouble("id", id);
|
||||||
if (!entity.level().isClientSide() && entity.getServer() != null) {
|
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,
|
entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4,
|
||||||
|
@ -205,15 +205,15 @@ public class Devotion extends GunItem implements GeoItem, AnimatedItem {
|
||||||
}
|
}
|
||||||
if (mainHandItem.getItem() == itemstack.getItem()
|
if (mainHandItem.getItem() == itemstack.getItem()
|
||||||
&& mainHandItemTag.getDouble("id") == id) {
|
&& mainHandItemTag.getDouble("id") == id) {
|
||||||
if (itemTag.getDouble("reloadtime") > 0) {
|
if (itemTag.getDouble("reloading_time") > 0) {
|
||||||
itemTag.putDouble("reloadtime", (itemTag.getDouble("reloadtime") - 1));
|
itemTag.putDouble("reloading_time", (itemTag.getDouble("reloading_time") - 1));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
itemTag.putDouble("reloading", 0);
|
itemTag.putBoolean("reloading", false);
|
||||||
itemTag.putDouble("emptyreload", 0);
|
itemTag.putBoolean("empty_reload", false);
|
||||||
itemTag.putDouble("reloadtime", 0);
|
itemTag.putDouble("reloading_time", 0);
|
||||||
}
|
}
|
||||||
if (itemTag.getDouble("reloadtime") == 1 && mainHandItemTag.getDouble("id") == id) {
|
if (itemTag.getDouble("reloading_time") == 1 && mainHandItemTag.getDouble("id") == id) {
|
||||||
GunReload.reload(entity, GunInfo.Type.RIFLE, true);
|
GunReload.reload(entity, GunInfo.Type.RIFLE, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -81,8 +81,8 @@ public abstract class GunItem extends Item {
|
||||||
tag.putDouble("drawtime", (tag.getDouble("drawtime") + 1));
|
tag.putDouble("drawtime", (tag.getDouble("drawtime") + 1));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (tag.getDouble("fireanim") > 0) {
|
if (tag.getInt("fire_animation") > 0) {
|
||||||
tag.putDouble("fireanim", (tag.getDouble("fireanim") - 1));
|
tag.putInt("fire_animation", (tag.getInt("fire_animation") - 1));
|
||||||
}
|
}
|
||||||
if (tag.getDouble("flash_time") > 0) {
|
if (tag.getDouble("flash_time") > 0) {
|
||||||
tag.putDouble("flash_time", (tag.getDouble("flash_time") - 1));
|
tag.putDouble("flash_time", (tag.getDouble("flash_time") - 1));
|
||||||
|
|
|
@ -81,23 +81,23 @@ public class Hk416Item extends GunItem implements GeoItem, AnimatedItem {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m4.draw"));
|
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m4.draw"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("fireanim") > 0) {
|
if (stack.getOrCreateTag().getInt("fire_animation") > 0) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m4.fire"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m4.fire"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("reloading") == 1 && stack.getOrCreateTag().getDouble("emptyreload") == 1) {
|
if (stack.getOrCreateTag().getBoolean("reloading") && stack.getOrCreateTag().getBoolean("empty_reload")) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m4.reload"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m4.reload"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("reloading") == 1 && stack.getOrCreateTag().getDouble("emptyreload") == 0) {
|
if (stack.getOrCreateTag().getBoolean("reloading") && !stack.getOrCreateTag().getBoolean("empty_reload")) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m4.reload2"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m4.reload2"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getInt("firemode") == 0 && stack.getOrCreateTag().getDouble("cg") > 0) {
|
if (stack.getOrCreateTag().getInt("fire_mode") == 0 && stack.getOrCreateTag().getDouble("cg") > 0) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m4.changefirerate2"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m4.changefirerate2"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getInt("firemode") == 2 && stack.getOrCreateTag().getDouble("cg") > 0) {
|
if (stack.getOrCreateTag().getInt("fire_mode") == 2 && stack.getOrCreateTag().getDouble("cg") > 0) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m4.changefirerate"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m4.changefirerate"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -90,11 +90,11 @@ public class HuntingRifle extends GunItem implements GeoItem, AnimatedItem {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.hunting_rifle.draw"));
|
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.hunting_rifle.draw"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("fireanim") > 0) {
|
if (stack.getOrCreateTag().getInt("fire_animation") > 0) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.hunting_rifle.fire"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.hunting_rifle.fire"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("reloading") == 1 && stack.getOrCreateTag().getDouble("emptyreload") == 1) {
|
if (stack.getOrCreateTag().getBoolean("reloading") && stack.getOrCreateTag().getBoolean("empty_reload")) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.hunting_rifle.reload"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.hunting_rifle.reload"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -171,12 +171,12 @@ public class HuntingRifle extends GunItem implements GeoItem, AnimatedItem {
|
||||||
var mainHandItemTag = mainHandItem.getOrCreateTag();
|
var mainHandItemTag = mainHandItem.getOrCreateTag();
|
||||||
|
|
||||||
if (mainHandItemTag.getDouble("id") != itemTag.getDouble("id")) {
|
if (mainHandItemTag.getDouble("id") != itemTag.getDouble("id")) {
|
||||||
itemTag.putDouble("emptyreload", 0);
|
itemTag.putBoolean("empty_reload", false);
|
||||||
itemTag.putDouble("reloading", 0);
|
itemTag.putBoolean("reloading", false);
|
||||||
itemTag.putDouble("reloadtime", 0);
|
itemTag.putDouble("reloading_time", 0);
|
||||||
}
|
}
|
||||||
if (itemTag.getDouble("reloading") == 1 && itemTag.getInt("ammo") == 0) {
|
if (itemTag.getBoolean("reloading") && itemTag.getInt("ammo") == 0) {
|
||||||
if (itemTag.getDouble("reloadtime") == 61) {
|
if (itemTag.getDouble("reloading_time") == 61) {
|
||||||
entity.getPersistentData().putDouble("id", id);
|
entity.getPersistentData().putDouble("id", id);
|
||||||
if (!entity.level().isClientSide() && entity.getServer() != null) {
|
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,
|
entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4,
|
||||||
|
@ -185,15 +185,15 @@ public class HuntingRifle extends GunItem implements GeoItem, AnimatedItem {
|
||||||
}
|
}
|
||||||
if (mainHandItem.getItem() == itemstack.getItem()
|
if (mainHandItem.getItem() == itemstack.getItem()
|
||||||
&& mainHandItemTag.getDouble("id") == id) {
|
&& mainHandItemTag.getDouble("id") == id) {
|
||||||
if (itemTag.getDouble("reloadtime") > 0) {
|
if (itemTag.getDouble("reloading_time") > 0) {
|
||||||
itemTag.putDouble("reloadtime", (itemTag.getDouble("reloadtime") - 1));
|
itemTag.putDouble("reloading_time", (itemTag.getDouble("reloading_time") - 1));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
itemTag.putDouble("emptyreload", 0);
|
itemTag.putBoolean("empty_reload", false);
|
||||||
itemTag.putDouble("reloading", 0);
|
itemTag.putBoolean("reloading", false);
|
||||||
itemTag.putDouble("reloadtime", 0);
|
itemTag.putDouble("reloading_time", 0);
|
||||||
}
|
}
|
||||||
if (itemTag.getDouble("reloadtime") == 1 && mainHandItemTag.getDouble("id") == id) {
|
if (itemTag.getDouble("reloading_time") == 1 && mainHandItemTag.getDouble("id") == id) {
|
||||||
GunReload.reload(entity, GunInfo.Type.SNIPER);
|
GunReload.reload(entity, GunInfo.Type.SNIPER);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -97,15 +97,15 @@ public class Kraber extends GunItem implements GeoItem, AnimatedItem {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.kraber.shift"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.kraber.shift"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("fireanim") > 0) {
|
if (stack.getOrCreateTag().getInt("fire_animation") > 0) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.kraber.fire"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.kraber.fire"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("reloading") == 1 && stack.getOrCreateTag().getDouble("emptyreload") == 1) {
|
if (stack.getOrCreateTag().getBoolean("reloading") && stack.getOrCreateTag().getBoolean("empty_reload")) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.kraber.reload"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.kraber.reload"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("reloading") == 1 && stack.getOrCreateTag().getDouble("emptyreload") == 0) {
|
if (stack.getOrCreateTag().getBoolean("reloading") && !stack.getOrCreateTag().getBoolean("empty_reload")) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.kraber.reload2"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.kraber.reload2"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -81,23 +81,23 @@ public class M4Item extends GunItem implements GeoItem, AnimatedItem {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m4.draw"));
|
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m4.draw"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("fireanim") > 0) {
|
if (stack.getOrCreateTag().getInt("fire_animation") > 0) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m4.fire"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m4.fire"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("reloading") == 1 && stack.getOrCreateTag().getDouble("emptyreload") == 1) {
|
if (stack.getOrCreateTag().getBoolean("reloading") && stack.getOrCreateTag().getBoolean("empty_reload")) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m4.reload"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m4.reload"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("reloading") == 1 && stack.getOrCreateTag().getDouble("emptyreload") == 0) {
|
if (stack.getOrCreateTag().getBoolean("reloading") && !stack.getOrCreateTag().getBoolean("empty_reload")) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m4.reload2"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m4.reload2"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getInt("firemode") == 0 && stack.getOrCreateTag().getDouble("cg") > 0) {
|
if (stack.getOrCreateTag().getInt("fire_mode") == 0 && stack.getOrCreateTag().getDouble("cg") > 0) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m4.changefirerate2"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m4.changefirerate2"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getInt("firemode") == 2 && stack.getOrCreateTag().getDouble("cg") > 0) {
|
if (stack.getOrCreateTag().getInt("fire_mode") == 2 && stack.getOrCreateTag().getDouble("cg") > 0) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m4.changefirerate"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m4.changefirerate"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -81,27 +81,27 @@ public class M60Item extends GunItem implements GeoItem, AnimatedItem {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m60.draw"));
|
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m60.draw"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("fireanim") > 0 && stack.getOrCreateTag().getDouble("animindex") == 0) {
|
if (stack.getOrCreateTag().getInt("fire_animation") > 0 && stack.getOrCreateTag().getDouble("animindex") == 0) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m60.fire"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m60.fire"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("fireanim") > 0 && stack.getOrCreateTag().getDouble("animindex") == 1) {
|
if (stack.getOrCreateTag().getInt("fire_animation") > 0 && stack.getOrCreateTag().getDouble("animindex") == 1) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m60.fire2"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m60.fire2"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("reloading") == 1 && stack.getOrCreateTag().getDouble("emptyreload") == 1) {
|
if (stack.getOrCreateTag().getBoolean("reloading") && stack.getOrCreateTag().getBoolean("empty_reload")) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m60.reload"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m60.reload"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("reloading") == 1 && stack.getOrCreateTag().getDouble("emptyreload") == 0) {
|
if (stack.getOrCreateTag().getBoolean("reloading") && !stack.getOrCreateTag().getBoolean("empty_reload")) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m60.reload2"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m60.reload2"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getInt("firemode") == 0 && stack.getOrCreateTag().getDouble("cg") > 0) {
|
if (stack.getOrCreateTag().getInt("fire_mode") == 0 && stack.getOrCreateTag().getDouble("cg") > 0) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m60.changefirerate2"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m60.changefirerate2"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getInt("firemode") == 2 && stack.getOrCreateTag().getDouble("cg") > 0) {
|
if (stack.getOrCreateTag().getInt("fire_mode") == 2 && stack.getOrCreateTag().getDouble("cg") > 0) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m60.changefirerate"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m60.changefirerate"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -87,11 +87,11 @@ public class M79Item extends GunItem implements GeoItem, AnimatedItem {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m79.draw"));
|
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m79.draw"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("fireanim") > 0) {
|
if (stack.getOrCreateTag().getInt("fire_animation") > 0) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m79.fire"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m79.fire"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("reloading") == 1 && stack.getOrCreateTag().getDouble("emptyreload") == 1) {
|
if (stack.getOrCreateTag().getBoolean("reloading") && stack.getOrCreateTag().getBoolean("empty_reload")) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m79.reload"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m79.reload"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -88,19 +88,19 @@ public class M870Item extends GunItem implements GeoItem, AnimatedItem {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m870.shift"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m870.shift"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("emptyreload") == 1 && stack.getOrCreateTag().getDouble("prepare") > 0) {
|
if (stack.getOrCreateTag().getBoolean("empty_reload") && stack.getOrCreateTag().getDouble("prepare") > 0) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m870.preparealt"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m870.preparealt"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("reloading") == 1 && stack.getOrCreateTag().getDouble("prepare") > 0) {
|
if (stack.getOrCreateTag().getBoolean("reloading") && stack.getOrCreateTag().getDouble("prepare") > 0) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m870.prepare"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m870.prepare"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("loadindex") == 0 && stack.getOrCreateTag().getDouble("loading") > 0) {
|
if (!stack.getOrCreateTag().getBoolean("load_index") && stack.getOrCreateTag().getDouble("loading") > 0) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m870.iterativeload"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m870.iterativeload"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("loadindex") == 1 && stack.getOrCreateTag().getDouble("loading") > 0) {
|
if (stack.getOrCreateTag().getBoolean("load_index") && stack.getOrCreateTag().getDouble("loading") > 0) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m870.iterativeload2"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m870.iterativeload2"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -85,15 +85,15 @@ public class M98bItem extends GunItem implements GeoItem, AnimatedItem {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m98b.shift"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m98b.shift"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("fireanim") > 0) {
|
if (stack.getOrCreateTag().getInt("fire_animation") > 0) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m98b.fire"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m98b.fire"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("reloading") == 1 && stack.getOrCreateTag().getDouble("emptyreload") == 1) {
|
if (stack.getOrCreateTag().getBoolean("reloading") && stack.getOrCreateTag().getBoolean("empty_reload")) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m98b.reload"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m98b.reload"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("reloading") == 1 && stack.getOrCreateTag().getDouble("emptyreload") == 0) {
|
if (stack.getOrCreateTag().getBoolean("reloading") && !stack.getOrCreateTag().getBoolean("empty_reload")) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m98b.reload2"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m98b.reload2"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -83,11 +83,11 @@ public class MarlinItem extends GunItem implements GeoItem, AnimatedItem {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.marlin.draw"));
|
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.marlin.draw"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("fireanim") > 0 && stack.getOrCreateTag().getDouble("animindex") == 0) {
|
if (stack.getOrCreateTag().getInt("fire_animation") > 0 && stack.getOrCreateTag().getDouble("animindex") == 0) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.marlin.fire"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.marlin.fire"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("fireanim") > 0 && stack.getOrCreateTag().getDouble("animindex") == 1) {
|
if (stack.getOrCreateTag().getInt("fire_animation") > 0 && stack.getOrCreateTag().getDouble("animindex") == 1) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.marlin.fire2"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.marlin.fire2"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -99,15 +99,15 @@ public class MarlinItem extends GunItem implements GeoItem, AnimatedItem {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.marlin.shift2"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.marlin.shift2"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("reloading") == 1 && stack.getOrCreateTag().getDouble("prepare") > 0) {
|
if (stack.getOrCreateTag().getBoolean("reloading") && stack.getOrCreateTag().getDouble("prepare") > 0) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.marlin.prepare"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.marlin.prepare"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("loadindex") == 0 && stack.getOrCreateTag().getDouble("loading") > 0) {
|
if (!stack.getOrCreateTag().getBoolean("load_index") && stack.getOrCreateTag().getDouble("loading") > 0) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.marlin.iterativeload"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.marlin.iterativeload"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("loadindex") == 1 && stack.getOrCreateTag().getDouble("loading") > 0) {
|
if (stack.getOrCreateTag().getBoolean("load_index") && stack.getOrCreateTag().getDouble("loading") > 0) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.marlin.iterativeload2"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.marlin.iterativeload2"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -44,7 +44,7 @@ import java.util.UUID;
|
||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
|
|
||||||
public class Minigun extends GunItem implements GeoItem, AnimatedItem {
|
public class Minigun extends GunItem implements GeoItem, AnimatedItem {
|
||||||
private static final String TAG_HEAT = "heatbar";
|
private static final String TAG_HEAT = "heat_bar";
|
||||||
private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this);
|
private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this);
|
||||||
public String animationProcedure = "empty";
|
public String animationProcedure = "empty";
|
||||||
public static ItemDisplayContext transformType;
|
public static ItemDisplayContext transformType;
|
||||||
|
|
|
@ -81,23 +81,23 @@ public class Mk14Item extends GunItem implements GeoItem, AnimatedItem {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.model.draw"));
|
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.model.draw"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("fireanim") > 0) {
|
if (stack.getOrCreateTag().getInt("fire_animation") > 0) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.model.fire"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.model.fire"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("reloading") == 1 && stack.getOrCreateTag().getDouble("emptyreload") == 1) {
|
if (stack.getOrCreateTag().getBoolean("reloading") && stack.getOrCreateTag().getBoolean("empty_reload")) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.model.reloadempty"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.model.reloadempty"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("reloading") == 1 && stack.getOrCreateTag().getDouble("emptyreload") == 0) {
|
if (stack.getOrCreateTag().getBoolean("reloading") && !stack.getOrCreateTag().getBoolean("empty_reload")) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.model.reload"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.model.reload"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getInt("firemode") == 0 && stack.getOrCreateTag().getDouble("cg") > 0) {
|
if (stack.getOrCreateTag().getInt("fire_mode") == 0 && stack.getOrCreateTag().getDouble("cg") > 0) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.model.changefirerate2"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.model.changefirerate2"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getInt("firemode") == 2 && stack.getOrCreateTag().getDouble("cg") > 0) {
|
if (stack.getOrCreateTag().getInt("fire_mode") == 2 && stack.getOrCreateTag().getDouble("cg") > 0) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.model.changefirerate"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.model.changefirerate"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -82,11 +82,11 @@ public class RpgItem extends GunItem implements GeoItem, AnimatedItem {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.rpg.draw"));
|
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.rpg.draw"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("fireanim") > 0) {
|
if (stack.getOrCreateTag().getInt("fire_animation") > 0) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.rpg.fire"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.rpg.fire"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("reloading") == 1 && stack.getOrCreateTag().getDouble("emptyreload") == 1) {
|
if (stack.getOrCreateTag().getBoolean("reloading") && stack.getOrCreateTag().getBoolean("empty_reload")) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.rpg.reload"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.rpg.reload"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -81,23 +81,23 @@ public class RpkItem extends GunItem implements GeoItem, AnimatedItem {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ak47.draw"));
|
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ak47.draw"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("fireanim") > 0) {
|
if (stack.getOrCreateTag().getInt("fire_animation") > 0) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.fire"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.fire"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("reloading") == 1 && stack.getOrCreateTag().getDouble("emptyreload") == 1) {
|
if (stack.getOrCreateTag().getBoolean("reloading") && stack.getOrCreateTag().getBoolean("empty_reload")) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.reload"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.reload"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("reloading") == 1 && stack.getOrCreateTag().getDouble("emptyreload") == 0) {
|
if (stack.getOrCreateTag().getBoolean("reloading") && !stack.getOrCreateTag().getBoolean("empty_reload")) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.reload2"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.reload2"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getInt("firemode") == 0 && stack.getOrCreateTag().getDouble("cg") > 0) {
|
if (stack.getOrCreateTag().getInt("fire_mode") == 0 && stack.getOrCreateTag().getDouble("cg") > 0) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.changefirerate2"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.changefirerate2"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getInt("firemode") == 2 && stack.getOrCreateTag().getDouble("cg") > 0) {
|
if (stack.getOrCreateTag().getInt("fire_mode") == 2 && stack.getOrCreateTag().getDouble("cg") > 0) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.changefirerate"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.changefirerate"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -110,15 +110,15 @@ public class SentinelItem extends GunItem implements GeoItem, AnimatedItem {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sentinel.shift"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sentinel.shift"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("fireanim") > 0) {
|
if (stack.getOrCreateTag().getInt("fire_animation") > 0) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sentinel.fire"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sentinel.fire"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("reloading") == 1 && stack.getOrCreateTag().getDouble("emptyreload") == 1) {
|
if (stack.getOrCreateTag().getBoolean("reloading") && stack.getOrCreateTag().getBoolean("empty_reload")) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sentinel.reload"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sentinel.reload"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("reloading") == 1 && stack.getOrCreateTag().getDouble("emptyreload") == 0) {
|
if (stack.getOrCreateTag().getBoolean("reloading") && !stack.getOrCreateTag().getBoolean("empty_reload")) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sentinel.reload2"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sentinel.reload2"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -86,15 +86,15 @@ public class SksItem extends GunItem implements GeoItem, AnimatedItem {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.sks.draw"));
|
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.sks.draw"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("fireanim") > 0) {
|
if (stack.getOrCreateTag().getInt("fire_animation") > 0) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sks.fire"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sks.fire"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("reloading") == 1 && stack.getOrCreateTag().getDouble("emptyreload") == 1) {
|
if (stack.getOrCreateTag().getBoolean("reloading") && stack.getOrCreateTag().getBoolean("empty_reload")) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sks.reload"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sks.reload"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("reloading") == 1 && stack.getOrCreateTag().getDouble("emptyreload") == 0) {
|
if (stack.getOrCreateTag().getBoolean("reloading") && !stack.getOrCreateTag().getBoolean("empty_reload")) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sks.reload2"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sks.reload2"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -76,20 +76,20 @@ public class SvdItem extends GunItem implements GeoItem, AnimatedItem {
|
||||||
ItemStack stack = player.getMainHandItem();
|
ItemStack stack = player.getMainHandItem();
|
||||||
|
|
||||||
if (this.animationProcedure.equals("empty")) {
|
if (this.animationProcedure.equals("empty")) {
|
||||||
|
var tag = stack.getOrCreateTag();
|
||||||
if (stack.getOrCreateTag().getDouble("drawtime") < 16) {
|
if (tag.getDouble("drawtime") < 16) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.svd.draw"));
|
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.svd.draw"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("fireanim") > 0) {
|
if (tag.getInt("fire_animation") > 0) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.svd.fire"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.svd.fire"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("reloading") == 1 && stack.getOrCreateTag().getDouble("emptyreload") == 1) {
|
if (tag.getBoolean("reloading") && tag.getBoolean("empty_reload")) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.svd.reload"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.svd.reload"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("reloading") == 1 && stack.getOrCreateTag().getDouble("emptyreload") == 0) {
|
if (tag.getBoolean("reloading") && !tag.getBoolean("empty_reload")) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.svd.reload2"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.svd.reload2"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -88,11 +88,11 @@ public class Taser extends GunItem implements GeoItem, AnimatedItem {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.taser.draw"));
|
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.taser.draw"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("fireanim") > 1) {
|
if (stack.getOrCreateTag().getInt("fire_animation") > 1) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.taser.fire"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.taser.fire"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("reloading") == 1) {
|
if (stack.getOrCreateTag().getBoolean("reloading")) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.taser.reload"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.taser.reload"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -92,11 +92,11 @@ public class Trachelium extends GunItem implements GeoItem, AnimatedItem {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.trachelium.draw"));
|
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.trachelium.draw"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("fireanim") > 1) {
|
if (stack.getOrCreateTag().getInt("fire_animation") > 1) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.trachelium.fire"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.trachelium.fire"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("reloading") == 1 && stack.getOrCreateTag().getDouble("emptyreload") == 1) {
|
if (stack.getOrCreateTag().getBoolean("reloading") && stack.getOrCreateTag().getBoolean("empty_reload")) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.trachelium.reload"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.trachelium.reload"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -167,12 +167,12 @@ public class Trachelium extends GunItem implements GeoItem, AnimatedItem {
|
||||||
var mainHandItemTag = mainHandItem.getOrCreateTag();
|
var mainHandItemTag = mainHandItem.getOrCreateTag();
|
||||||
|
|
||||||
if (mainHandItemTag.getDouble("id") != itemTag.getDouble("id")) {
|
if (mainHandItemTag.getDouble("id") != itemTag.getDouble("id")) {
|
||||||
itemTag.putDouble("emptyreload", 0);
|
itemTag.putBoolean("empty_reload", false);
|
||||||
itemTag.putDouble("reloading", 0);
|
itemTag.putBoolean("reloading", false);
|
||||||
itemTag.putDouble("reloadtime", 0);
|
itemTag.putDouble("reloading_time", 0);
|
||||||
}
|
}
|
||||||
if (itemTag.getDouble("reloading") == 1) {
|
if (itemTag.getBoolean("reloading")) {
|
||||||
if (itemTag.getDouble("reloadtime") == 57) {
|
if (itemTag.getDouble("reloading_time") == 57) {
|
||||||
entity.getPersistentData().putDouble("id", id);
|
entity.getPersistentData().putDouble("id", id);
|
||||||
if (!entity.level().isClientSide() && entity.getServer() != null) {
|
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,
|
entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4,
|
||||||
|
@ -181,15 +181,15 @@ public class Trachelium extends GunItem implements GeoItem, AnimatedItem {
|
||||||
}
|
}
|
||||||
if (mainHandItem.getItem() == itemstack.getItem()
|
if (mainHandItem.getItem() == itemstack.getItem()
|
||||||
&& mainHandItemTag.getDouble("id") == id) {
|
&& mainHandItemTag.getDouble("id") == id) {
|
||||||
if (itemTag.getDouble("reloadtime") > 0) {
|
if (itemTag.getDouble("reloading_time") > 0) {
|
||||||
itemTag.putDouble("reloadtime", (itemTag.getDouble("reloadtime") - 1));
|
itemTag.putDouble("reloading_time", (itemTag.getDouble("reloading_time") - 1));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
itemTag.putDouble("reloading", 0);
|
itemTag.putBoolean("reloading", false);
|
||||||
itemTag.putDouble("emptyreload", 0);
|
itemTag.putBoolean("empty_reload", false);
|
||||||
itemTag.putDouble("reloadtime", 0);
|
itemTag.putDouble("reloading_time", 0);
|
||||||
}
|
}
|
||||||
if (itemTag.getDouble("reloadtime") == 1 && mainHandItemTag.getDouble("id") == id) {
|
if (itemTag.getDouble("reloading_time") == 1 && mainHandItemTag.getDouble("id") == id) {
|
||||||
GunReload.reload(entity, GunInfo.Type.HANDGUN);
|
GunReload.reload(entity, GunInfo.Type.HANDGUN);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -92,8 +92,8 @@ public class VectorItem extends GunItem implements GeoItem, AnimatedItem {
|
||||||
ItemStack mainHandItem = player.getMainHandItem();
|
ItemStack mainHandItem = player.getMainHandItem();
|
||||||
CompoundTag tag = mainHandItem.getOrCreateTag();
|
CompoundTag tag = mainHandItem.getOrCreateTag();
|
||||||
if (mainHandItem.is(TargetModTags.Items.GUN)) {
|
if (mainHandItem.is(TargetModTags.Items.GUN)) {
|
||||||
if (tag.getInt("firemode") == 1) {
|
if (tag.getInt("fire_mode") == 1) {
|
||||||
player.getPersistentData().putDouble("firing", 0);
|
player.getPersistentData().putBoolean("firing", false);
|
||||||
}
|
}
|
||||||
if (tag.getInt("ammo") == 0) {
|
if (tag.getInt("ammo") == 0) {
|
||||||
tag.putDouble("burst", 0);
|
tag.putDouble("burst", 0);
|
||||||
|
@ -101,14 +101,14 @@ public class VectorItem extends GunItem implements GeoItem, AnimatedItem {
|
||||||
}
|
}
|
||||||
Item item = mainHandItem.getItem();
|
Item item = mainHandItem.getItem();
|
||||||
if (item == TargetModItems.VECTOR.get()
|
if (item == TargetModItems.VECTOR.get()
|
||||||
&& tag.getDouble("reloading") == 0
|
&& !tag.getBoolean("reloading")
|
||||||
&& tag.getInt("ammo") > 0
|
&& tag.getInt("ammo") > 0
|
||||||
&& !player.getCooldowns().isOnCooldown(item)
|
&& !player.getCooldowns().isOnCooldown(item)
|
||||||
&& tag.getDouble("burst") > 0
|
&& tag.getDouble("burst") > 0
|
||||||
) {
|
) {
|
||||||
player.getCooldowns().addCooldown(item, tag.getDouble("burst") == 1 ? 5 : 1);
|
player.getCooldowns().addCooldown(item, tag.getDouble("burst") == 1 ? 5 : 1);
|
||||||
tag.putDouble("burst", tag.getDouble("burst") - 1);
|
tag.putDouble("burst", tag.getDouble("burst") - 1);
|
||||||
tag.putDouble("fireanim", 2);
|
tag.putInt("fire_animation", 2);
|
||||||
tag.putInt("ammo", (tag.getInt("ammo") - 1));
|
tag.putInt("ammo", (tag.getInt("ammo") - 1));
|
||||||
|
|
||||||
GunsTool.spawnBullet(player);
|
GunsTool.spawnBullet(player);
|
||||||
|
@ -168,27 +168,27 @@ public class VectorItem extends GunItem implements GeoItem, AnimatedItem {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.vec.draw"));
|
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.vec.draw"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("fireanim") > 0) {
|
if (stack.getOrCreateTag().getInt("fire_animation") > 0) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.vec.fire"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.vec.fire"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("reloading") == 1 && stack.getOrCreateTag().getDouble("emptyreload") == 1) {
|
if (stack.getOrCreateTag().getBoolean("reloading") && stack.getOrCreateTag().getBoolean("empty_reload")) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.vec.reload"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.vec.reload"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getDouble("reloading") == 1 && stack.getOrCreateTag().getDouble("emptyreload") == 0) {
|
if (stack.getOrCreateTag().getBoolean("reloading") && !stack.getOrCreateTag().getBoolean("empty_reload")) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.vec.reload2"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.vec.reload2"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getInt("firemode") == 0 && stack.getOrCreateTag().getDouble("cg") > 0) {
|
if (stack.getOrCreateTag().getInt("fire_mode") == 0 && stack.getOrCreateTag().getDouble("cg") > 0) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.vec.changefirerate3"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.vec.changefirerate3"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getInt("firemode") == 1 && stack.getOrCreateTag().getDouble("cg") > 0) {
|
if (stack.getOrCreateTag().getInt("fire_mode") == 1 && stack.getOrCreateTag().getDouble("cg") > 0) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.vec.changefirerate2"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.vec.changefirerate2"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stack.getOrCreateTag().getInt("firemode") == 2 && stack.getOrCreateTag().getDouble("cg") > 0) {
|
if (stack.getOrCreateTag().getInt("fire_mode") == 2 && stack.getOrCreateTag().getDouble("cg") > 0) {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.vec.changefirerate"));
|
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.vec.changefirerate"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -241,12 +241,12 @@ public class VectorItem extends GunItem implements GeoItem, AnimatedItem {
|
||||||
double id = tag.getDouble("id");
|
double id = tag.getDouble("id");
|
||||||
var mainHandItem = entity instanceof LivingEntity living ? living.getMainHandItem() : ItemStack.EMPTY;
|
var mainHandItem = entity instanceof LivingEntity living ? living.getMainHandItem() : ItemStack.EMPTY;
|
||||||
if (mainHandItem.getOrCreateTag().getDouble("id") != tag.getDouble("id")) {
|
if (mainHandItem.getOrCreateTag().getDouble("id") != tag.getDouble("id")) {
|
||||||
tag.putDouble("emptyreload", 0);
|
tag.putBoolean("empty_reload", false);
|
||||||
tag.putDouble("reloading", 0);
|
tag.putBoolean("reloading", false);
|
||||||
tag.putDouble("reloadtime", 0);
|
tag.putDouble("reloading_time", 0);
|
||||||
}
|
}
|
||||||
if (tag.getDouble("reloading") == 1 && tag.getInt("ammo") == 0) {
|
if (tag.getBoolean("reloading") && tag.getInt("ammo") == 0) {
|
||||||
if (tag.getDouble("reloadtime") == 61) {
|
if (tag.getDouble("reloading_time") == 61) {
|
||||||
entity.getPersistentData().putDouble("id", id);
|
entity.getPersistentData().putDouble("id", id);
|
||||||
if (entity instanceof ServerPlayer serverPlayer) {
|
if (entity instanceof ServerPlayer serverPlayer) {
|
||||||
serverPlayer.connection.send(new ClientboundSoundPacket(new Holder.Direct<>(ForgeRegistries.SOUND_EVENTS.getValue(new ResourceLocation("target:vector_reload_empty"))),
|
serverPlayer.connection.send(new ClientboundSoundPacket(new Holder.Direct<>(ForgeRegistries.SOUND_EVENTS.getValue(new ResourceLocation("target:vector_reload_empty"))),
|
||||||
|
@ -256,18 +256,18 @@ public class VectorItem extends GunItem implements GeoItem, AnimatedItem {
|
||||||
}
|
}
|
||||||
if (mainHandItem.getItem() == itemStack.getItem()
|
if (mainHandItem.getItem() == itemStack.getItem()
|
||||||
&& mainHandItem.getOrCreateTag().getDouble("id") == id
|
&& mainHandItem.getOrCreateTag().getDouble("id") == id
|
||||||
&& tag.getDouble("reloadtime") > 0) {
|
&& tag.getDouble("reloading_time") > 0) {
|
||||||
tag.putDouble("reloadtime", tag.getDouble("reloadtime") - 1);
|
tag.putDouble("reloading_time", tag.getDouble("reloading_time") - 1);
|
||||||
} else {
|
} else {
|
||||||
tag.putDouble("reloading", 0);
|
tag.putBoolean("reloading", false);
|
||||||
tag.putDouble("emptyreload", 0);
|
tag.putBoolean("empty_reload", false);
|
||||||
tag.putDouble("reloadtime", 0);
|
tag.putDouble("reloading_time", 0);
|
||||||
}
|
}
|
||||||
if (tag.getDouble("reloadtime") == 1 && mainHandItem.getOrCreateTag().getDouble("id") == id) {
|
if (tag.getDouble("reloading_time") == 1 && mainHandItem.getOrCreateTag().getDouble("id") == id) {
|
||||||
GunReload.reload(entity, GunInfo.Type.HANDGUN);
|
GunReload.reload(entity, GunInfo.Type.HANDGUN);
|
||||||
}
|
}
|
||||||
} else if (tag.getDouble("reloading") == 1 && tag.getInt("ammo") > 0) {
|
} else if (tag.getBoolean("reloading") && tag.getInt("ammo") > 0) {
|
||||||
if (tag.getDouble("reloadtime") == 47) {
|
if (tag.getDouble("reloading_time") == 47) {
|
||||||
entity.getPersistentData().putDouble("id", id);
|
entity.getPersistentData().putDouble("id", id);
|
||||||
if (entity instanceof ServerPlayer serverPlayer) {
|
if (entity instanceof ServerPlayer serverPlayer) {
|
||||||
serverPlayer.connection.send(new ClientboundSoundPacket(new Holder.Direct<>(ForgeRegistries.SOUND_EVENTS.getValue(new ResourceLocation("target:vector_reload_normal"))),
|
serverPlayer.connection.send(new ClientboundSoundPacket(new Holder.Direct<>(ForgeRegistries.SOUND_EVENTS.getValue(new ResourceLocation("target:vector_reload_normal"))),
|
||||||
|
@ -277,14 +277,14 @@ public class VectorItem extends GunItem implements GeoItem, AnimatedItem {
|
||||||
}
|
}
|
||||||
if (mainHandItem.getItem() == itemStack.getItem()
|
if (mainHandItem.getItem() == itemStack.getItem()
|
||||||
&& mainHandItem.getOrCreateTag().getDouble("id") == id
|
&& mainHandItem.getOrCreateTag().getDouble("id") == id
|
||||||
&& tag.getDouble("reloadtime") > 0) {
|
&& tag.getDouble("reloading_time") > 0) {
|
||||||
tag.putDouble("reloadtime", (tag.getDouble("reloadtime") - 1));
|
tag.putDouble("reloading_time", (tag.getDouble("reloading_time") - 1));
|
||||||
} else {
|
} else {
|
||||||
tag.putDouble("reloading", 0);
|
tag.putBoolean("reloading", false);
|
||||||
tag.putDouble("emptyreload", 0);
|
tag.putBoolean("empty_reload", false);
|
||||||
tag.putDouble("reloadtime", 0);
|
tag.putDouble("reloading_time", 0);
|
||||||
}
|
}
|
||||||
if (tag.getDouble("reloadtime") == 1 && mainHandItem.getOrCreateTag().getDouble("id") == id) {
|
if (tag.getDouble("reloading_time") == 1 && mainHandItem.getOrCreateTag().getDouble("id") == id) {
|
||||||
GunReload.reload(entity, GunInfo.Type.HANDGUN, true);
|
GunReload.reload(entity, GunInfo.Type.HANDGUN, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -53,9 +53,9 @@ public class FireMessage {
|
||||||
if (type == 0) {
|
if (type == 0) {
|
||||||
PressFireProcedure.execute(player);
|
PressFireProcedure.execute(player);
|
||||||
} else if (type == 1) {
|
} else if (type == 1) {
|
||||||
player.getPersistentData().putDouble("firing", 0);
|
player.getPersistentData().putBoolean("firing", false);
|
||||||
player.getPersistentData().putDouble("minifiring", 0);
|
player.getPersistentData().putDouble("mini_firing", 0);
|
||||||
player.getPersistentData().putDouble("minigunfiring", 0);
|
player.getPersistentData().putDouble("minigun_firing", 0);
|
||||||
player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
|
player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
|
||||||
capability.bowPullHold = false;
|
capability.bowPullHold = false;
|
||||||
capability.syncPlayerVariables(player);
|
capability.syncPlayerVariables(player);
|
||||||
|
@ -86,7 +86,7 @@ public class FireMessage {
|
||||||
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
|
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
|
||||||
Level level = player.level();
|
Level level = player.level();
|
||||||
if (!level.isClientSide()) {
|
if (!level.isClientSide()) {
|
||||||
float damage = (float) (0.02 * stack.getOrCreateTag().getDouble("damage") * (1 + 0.05 * stack.getOrCreateTag().getDouble("level")));
|
float damage = (float) (0.02 * stack.getOrCreateTag().getDouble("damage") * (1 + 0.05 * stack.getOrCreateTag().getInt("level")));
|
||||||
|
|
||||||
BocekarrowEntity arrow = new BocekarrowEntity(TargetModEntities.BOCEKARROW.get(), level);
|
BocekarrowEntity arrow = new BocekarrowEntity(TargetModEntities.BOCEKARROW.get(), level);
|
||||||
arrow.setOwner(player);
|
arrow.setOwner(player);
|
||||||
|
@ -128,9 +128,9 @@ public class FireMessage {
|
||||||
});
|
});
|
||||||
|
|
||||||
player.getCooldowns().addCooldown(player.getMainHandItem().getItem(), 7);
|
player.getCooldowns().addCooldown(player.getMainHandItem().getItem(), 7);
|
||||||
player.getMainHandItem().getOrCreateTag().putDouble("arrowempty", 7);
|
player.getMainHandItem().getOrCreateTag().putInt("arrow_empty", 7);
|
||||||
player.getMainHandItem().getOrCreateTag().putDouble("power", 0);
|
player.getMainHandItem().getOrCreateTag().putDouble("power", 0);
|
||||||
stack.getOrCreateTag().putDouble("fireanim", 2);
|
stack.getOrCreateTag().putInt("fire_animation", 2);
|
||||||
|
|
||||||
if (!player.isCreative()) {
|
if (!player.isCreative()) {
|
||||||
player.getInventory().clearOrCountMatchingItems(p -> Items.ARROW == p.getItem(), 1, player.inventoryMenu.getCraftSlots());
|
player.getInventory().clearOrCountMatchingItems(p -> Items.ARROW == p.getItem(), 1, player.inventoryMenu.getCraftSlots());
|
||||||
|
|
|
@ -62,7 +62,7 @@ public class FireModeMessage {
|
||||||
SoundSource.PLAYERS, serverPlayer.getX(), serverPlayer.getY(), serverPlayer.getZ(), 1f, 1f, serverPlayer.level().random.nextLong()));
|
SoundSource.PLAYERS, serverPlayer.getX(), serverPlayer.getY(), serverPlayer.getZ(), 1f, 1f, serverPlayer.level().random.nextLong()));
|
||||||
}
|
}
|
||||||
|
|
||||||
tag.putInt("firemode", mode);
|
tag.putInt("fire_mode", mode);
|
||||||
tag.putDouble("cg", 10);
|
tag.putDouble("cg", 10);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -70,7 +70,7 @@ public class FireModeMessage {
|
||||||
ItemStack mainHandItem = player.getMainHandItem();
|
ItemStack mainHandItem = player.getMainHandItem();
|
||||||
CompoundTag tag = mainHandItem.getOrCreateTag();
|
CompoundTag tag = mainHandItem.getOrCreateTag();
|
||||||
Item item = mainHandItem.getItem();
|
Item item = mainHandItem.getItem();
|
||||||
int fireMode = (int) tag.getInt("firemode");
|
int fireMode = (int) tag.getInt("fire_mode");
|
||||||
|
|
||||||
if (item == TargetModItems.AK_47.get()
|
if (item == TargetModItems.AK_47.get()
|
||||||
|| item == TargetModItems.M_4.get()
|
|| item == TargetModItems.M_4.get()
|
||||||
|
|
|
@ -84,7 +84,7 @@ public class GunRecycleGuiButtonMessage {
|
||||||
}
|
}
|
||||||
|
|
||||||
// 高等级额外奖励
|
// 高等级额外奖励
|
||||||
double level = gun.getOrCreateTag().getDouble("level");
|
int level = gun.getOrCreateTag().getInt("level");
|
||||||
if (level >= 10) {
|
if (level >= 10) {
|
||||||
var soulSteelNuggetCount = 0;
|
var soulSteelNuggetCount = 0;
|
||||||
|
|
||||||
|
|
|
@ -280,9 +280,9 @@ public class TargetModVariables {
|
||||||
public boolean bowPullHold = false;
|
public boolean bowPullHold = false;
|
||||||
public boolean bowPull = false;
|
public boolean bowPull = false;
|
||||||
public boolean playerDoubleJump = false;
|
public boolean playerDoubleJump = false;
|
||||||
public double hitIndicator = 0;
|
public int hitIndicator = 0;
|
||||||
public double headIndicator = 0;
|
public int headIndicator = 0;
|
||||||
public double killIndicator = 0;
|
public int killIndicator = 0;
|
||||||
|
|
||||||
public void syncPlayerVariables(Entity entity) {
|
public void syncPlayerVariables(Entity entity) {
|
||||||
if (entity instanceof ServerPlayer)
|
if (entity instanceof ServerPlayer)
|
||||||
|
@ -305,9 +305,9 @@ public class TargetModVariables {
|
||||||
nbt.putBoolean("bow_pull_hold", bowPullHold);
|
nbt.putBoolean("bow_pull_hold", bowPullHold);
|
||||||
nbt.putBoolean("bow_pull", bowPull);
|
nbt.putBoolean("bow_pull", bowPull);
|
||||||
nbt.putBoolean("player_double_jump", playerDoubleJump);
|
nbt.putBoolean("player_double_jump", playerDoubleJump);
|
||||||
nbt.putDouble("hit_indicator", hitIndicator);
|
nbt.putInt("hit_indicator", hitIndicator);
|
||||||
nbt.putDouble("head_indicator", headIndicator);
|
nbt.putInt("head_indicator", headIndicator);
|
||||||
nbt.putDouble("kill_indicator", killIndicator);
|
nbt.putInt("kill_indicator", killIndicator);
|
||||||
return nbt;
|
return nbt;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -327,9 +327,9 @@ public class TargetModVariables {
|
||||||
bowPullHold = nbt.getBoolean("bow_pull_hold");
|
bowPullHold = nbt.getBoolean("bow_pull_hold");
|
||||||
bowPull = nbt.getBoolean("bow_pull");
|
bowPull = nbt.getBoolean("bow_pull");
|
||||||
playerDoubleJump = nbt.getBoolean("player_double_jump");
|
playerDoubleJump = nbt.getBoolean("player_double_jump");
|
||||||
hitIndicator = nbt.getDouble("hit_indicator");
|
hitIndicator = nbt.getInt("hit_indicator");
|
||||||
headIndicator = nbt.getDouble("head_indicator");
|
headIndicator = nbt.getInt("head_indicator");
|
||||||
killIndicator = nbt.getDouble("kill_indicator");
|
killIndicator = nbt.getInt("kill_indicator");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -16,12 +16,12 @@ public class AK47WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
|
||||||
double id = 0;
|
double id = 0;
|
||||||
id = itemstack.getOrCreateTag().getDouble("id");
|
id = itemstack.getOrCreateTag().getDouble("id");
|
||||||
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") != itemstack.getOrCreateTag().getDouble("id")) {
|
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") != itemstack.getOrCreateTag().getDouble("id")) {
|
||||||
itemstack.getOrCreateTag().putDouble("emptyreload", 0);
|
itemstack.getOrCreateTag().putBoolean("empty_reload", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloading", 0);
|
itemstack.getOrCreateTag().putBoolean("reloading", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", 0);
|
itemstack.getOrCreateTag().putDouble("reloading_time", 0);
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloading") == 1 && itemstack.getOrCreateTag().getInt("ammo") == 0) {
|
if (itemstack.getOrCreateTag().getBoolean("reloading") && itemstack.getOrCreateTag().getInt("ammo") == 0) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 57) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 57) {
|
||||||
entity.getPersistentData().putDouble("id", id);
|
entity.getPersistentData().putDouble("id", id);
|
||||||
{
|
{
|
||||||
if (!entity.level().isClientSide() && entity.getServer() != null) {
|
if (!entity.level().isClientSide() && entity.getServer() != null) {
|
||||||
|
@ -32,19 +32,19 @@ public class AK47WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
|
||||||
}
|
}
|
||||||
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
||||||
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") > 0) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") > 0) {
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", (itemstack.getOrCreateTag().getDouble("reloadtime") - 1));
|
itemstack.getOrCreateTag().putDouble("reloading_time", (itemstack.getOrCreateTag().getDouble("reloading_time") - 1));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
itemstack.getOrCreateTag().putDouble("reloading", 0);
|
itemstack.getOrCreateTag().putBoolean("reloading", false);
|
||||||
itemstack.getOrCreateTag().putDouble("emptyreload", 0);
|
itemstack.getOrCreateTag().putBoolean("empty_reload", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", 0);
|
itemstack.getOrCreateTag().putDouble("reloading_time", 0);
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
GunReload.reload(entity, GunInfo.Type.RIFLE);
|
GunReload.reload(entity, GunInfo.Type.RIFLE);
|
||||||
}
|
}
|
||||||
} else if (itemstack.getOrCreateTag().getDouble("reloading") == 1 && itemstack.getOrCreateTag().getInt("ammo") > 0) {
|
} else if (itemstack.getOrCreateTag().getBoolean("reloading") && itemstack.getOrCreateTag().getInt("ammo") > 0) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 41) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 41) {
|
||||||
entity.getPersistentData().putDouble("id", id);
|
entity.getPersistentData().putDouble("id", id);
|
||||||
{
|
{
|
||||||
if (!entity.level().isClientSide() && entity.getServer() != null) {
|
if (!entity.level().isClientSide() && entity.getServer() != null) {
|
||||||
|
@ -55,15 +55,15 @@ public class AK47WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
|
||||||
}
|
}
|
||||||
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
||||||
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") > 0) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") > 0) {
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", (itemstack.getOrCreateTag().getDouble("reloadtime") - 1));
|
itemstack.getOrCreateTag().putDouble("reloading_time", (itemstack.getOrCreateTag().getDouble("reloading_time") - 1));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
itemstack.getOrCreateTag().putDouble("reloading", 0);
|
itemstack.getOrCreateTag().putBoolean("reloading", false);
|
||||||
itemstack.getOrCreateTag().putDouble("emptyreload", 0);
|
itemstack.getOrCreateTag().putBoolean("empty_reload", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", 0);
|
itemstack.getOrCreateTag().putDouble("reloading_time", 0);
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
GunReload.reload(entity, GunInfo.Type.RIFLE, true);
|
GunReload.reload(entity, GunInfo.Type.RIFLE, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,12 +13,12 @@ public class Aa12WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
|
||||||
public static void execute(Entity entity, ItemStack itemstack) {
|
public static void execute(Entity entity, ItemStack itemstack) {
|
||||||
double id = itemstack.getOrCreateTag().getDouble("id");
|
double id = itemstack.getOrCreateTag().getDouble("id");
|
||||||
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") != itemstack.getOrCreateTag().getDouble("id")) {
|
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") != itemstack.getOrCreateTag().getDouble("id")) {
|
||||||
itemstack.getOrCreateTag().putDouble("emptyreload", 0);
|
itemstack.getOrCreateTag().putBoolean("empty_reload", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloading", 0);
|
itemstack.getOrCreateTag().putBoolean("reloading", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", 0);
|
itemstack.getOrCreateTag().putDouble("reloading_time", 0);
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloading") == 1 && itemstack.getOrCreateTag().getInt("ammo") == 0) {
|
if (itemstack.getOrCreateTag().getBoolean("reloading") && itemstack.getOrCreateTag().getInt("ammo") == 0) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 55) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 55) {
|
||||||
entity.getPersistentData().putDouble("id", id);
|
entity.getPersistentData().putDouble("id", id);
|
||||||
{
|
{
|
||||||
if (!entity.level().isClientSide() && entity.getServer() != null) {
|
if (!entity.level().isClientSide() && entity.getServer() != null) {
|
||||||
|
@ -29,19 +29,19 @@ public class Aa12WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
|
||||||
}
|
}
|
||||||
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
||||||
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") > 0) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") > 0) {
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", (itemstack.getOrCreateTag().getDouble("reloadtime") - 1));
|
itemstack.getOrCreateTag().putDouble("reloading_time", (itemstack.getOrCreateTag().getDouble("reloading_time") - 1));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
itemstack.getOrCreateTag().putDouble("reloading", 0);
|
itemstack.getOrCreateTag().putBoolean("reloading", false);
|
||||||
itemstack.getOrCreateTag().putDouble("emptyreload", 0);
|
itemstack.getOrCreateTag().putBoolean("empty_reload", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", 0);
|
itemstack.getOrCreateTag().putDouble("reloading_time", 0);
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
GunReload.reload(entity, GunInfo.Type.SHOTGUN);
|
GunReload.reload(entity, GunInfo.Type.SHOTGUN);
|
||||||
}
|
}
|
||||||
} else if (itemstack.getOrCreateTag().getDouble("reloading") == 1 && itemstack.getOrCreateTag().getInt("ammo") > 0) {
|
} else if (itemstack.getOrCreateTag().getBoolean("reloading") && itemstack.getOrCreateTag().getInt("ammo") > 0) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 44) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 44) {
|
||||||
entity.getPersistentData().putDouble("id", id);
|
entity.getPersistentData().putDouble("id", id);
|
||||||
{
|
{
|
||||||
if (!entity.level().isClientSide() && entity.getServer() != null) {
|
if (!entity.level().isClientSide() && entity.getServer() != null) {
|
||||||
|
@ -52,15 +52,15 @@ public class Aa12WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
|
||||||
}
|
}
|
||||||
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
||||||
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") > 0) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") > 0) {
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", (itemstack.getOrCreateTag().getDouble("reloadtime") - 1));
|
itemstack.getOrCreateTag().putDouble("reloading_time", (itemstack.getOrCreateTag().getDouble("reloading_time") - 1));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
itemstack.getOrCreateTag().putDouble("reloading", 0);
|
itemstack.getOrCreateTag().putBoolean("reloading", false);
|
||||||
itemstack.getOrCreateTag().putDouble("emptyreload", 0);
|
itemstack.getOrCreateTag().putBoolean("empty_reload", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", 0);
|
itemstack.getOrCreateTag().putDouble("reloading_time", 0);
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
GunReload.reload(entity, GunInfo.Type.SHOTGUN, true);
|
GunReload.reload(entity, GunInfo.Type.SHOTGUN, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
package net.mcreator.target.procedures;
|
package net.mcreator.target.procedures;
|
||||||
|
|
||||||
import net.mcreator.target.network.TargetModVariables;
|
|
||||||
import net.mcreator.target.tools.GunInfo;
|
import net.mcreator.target.tools.GunInfo;
|
||||||
import net.mcreator.target.tools.GunReload;
|
import net.mcreator.target.tools.GunReload;
|
||||||
import net.minecraft.commands.CommandSource;
|
import net.minecraft.commands.CommandSource;
|
||||||
|
@ -19,12 +18,12 @@ public class AbekiriWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
|
||||||
id = itemstack.getOrCreateTag().getDouble("id");
|
id = itemstack.getOrCreateTag().getDouble("id");
|
||||||
ammo1 = 2 - itemstack.getOrCreateTag().getInt("ammo");
|
ammo1 = 2 - itemstack.getOrCreateTag().getInt("ammo");
|
||||||
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") != itemstack.getOrCreateTag().getDouble("id")) {
|
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") != itemstack.getOrCreateTag().getDouble("id")) {
|
||||||
itemstack.getOrCreateTag().putDouble("emptyreload", 0);
|
itemstack.getOrCreateTag().putBoolean("empty_reload", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloading", 0);
|
itemstack.getOrCreateTag().putBoolean("reloading", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", 0);
|
itemstack.getOrCreateTag().putDouble("reloading_time", 0);
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloading") == 1 && itemstack.getOrCreateTag().getInt("ammo") == 0) {
|
if (itemstack.getOrCreateTag().getBoolean("reloading") && itemstack.getOrCreateTag().getInt("ammo") == 0) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 99) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 99) {
|
||||||
entity.getPersistentData().putDouble("id", id);
|
entity.getPersistentData().putDouble("id", id);
|
||||||
{
|
{
|
||||||
if (!entity.level().isClientSide() && entity.getServer() != null) {
|
if (!entity.level().isClientSide() && entity.getServer() != null) {
|
||||||
|
@ -35,19 +34,19 @@ public class AbekiriWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
|
||||||
}
|
}
|
||||||
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
||||||
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") > 0) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") > 0) {
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", (itemstack.getOrCreateTag().getDouble("reloadtime") - 1));
|
itemstack.getOrCreateTag().putDouble("reloading_time", (itemstack.getOrCreateTag().getDouble("reloading_time") - 1));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
itemstack.getOrCreateTag().putDouble("reloading", 0);
|
itemstack.getOrCreateTag().putBoolean("reloading", false);
|
||||||
itemstack.getOrCreateTag().putDouble("emptyreload", 0);
|
itemstack.getOrCreateTag().putBoolean("empty_reload", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", 0);
|
itemstack.getOrCreateTag().putDouble("reloading_time", 0);
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
GunReload.reload(entity, GunInfo.Type.SHOTGUN);
|
GunReload.reload(entity, GunInfo.Type.SHOTGUN);
|
||||||
}
|
}
|
||||||
} else if (itemstack.getOrCreateTag().getDouble("reloading") == 1 && itemstack.getOrCreateTag().getInt("ammo") == 1) {
|
} else if (itemstack.getOrCreateTag().getBoolean("reloading") && itemstack.getOrCreateTag().getInt("ammo") == 1) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 83) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 83) {
|
||||||
entity.getPersistentData().putDouble("id", id);
|
entity.getPersistentData().putDouble("id", id);
|
||||||
{
|
{
|
||||||
if (!entity.level().isClientSide() && entity.getServer() != null) {
|
if (!entity.level().isClientSide() && entity.getServer() != null) {
|
||||||
|
@ -58,15 +57,15 @@ public class AbekiriWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
|
||||||
}
|
}
|
||||||
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
||||||
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") > 0) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") > 0) {
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", (itemstack.getOrCreateTag().getDouble("reloadtime") - 1));
|
itemstack.getOrCreateTag().putDouble("reloading_time", (itemstack.getOrCreateTag().getDouble("reloading_time") - 1));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
itemstack.getOrCreateTag().putDouble("reloading", 0);
|
itemstack.getOrCreateTag().putBoolean("reloading", false);
|
||||||
itemstack.getOrCreateTag().putDouble("emptyreload", 0);
|
itemstack.getOrCreateTag().putBoolean("empty_reload", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", 0);
|
itemstack.getOrCreateTag().putDouble("reloading_time", 0);
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
GunReload.reload(entity, GunInfo.Type.SHOTGUN);
|
GunReload.reload(entity, GunInfo.Type.SHOTGUN);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,12 +16,12 @@ public class Hk416WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
|
||||||
double id;
|
double id;
|
||||||
id = itemstack.getOrCreateTag().getDouble("id");
|
id = itemstack.getOrCreateTag().getDouble("id");
|
||||||
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") != itemstack.getOrCreateTag().getDouble("id")) {
|
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") != itemstack.getOrCreateTag().getDouble("id")) {
|
||||||
itemstack.getOrCreateTag().putDouble("emptyreload", 0);
|
itemstack.getOrCreateTag().putBoolean("empty_reload", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloading", 0);
|
itemstack.getOrCreateTag().putBoolean("reloading", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", 0);
|
itemstack.getOrCreateTag().putDouble("reloading_time", 0);
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloading") == 1 && itemstack.getOrCreateTag().getInt("ammo") == 0) {
|
if (itemstack.getOrCreateTag().getBoolean("reloading") && itemstack.getOrCreateTag().getInt("ammo") == 0) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 55) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 55) {
|
||||||
entity.getPersistentData().putDouble("id", id);
|
entity.getPersistentData().putDouble("id", id);
|
||||||
{
|
{
|
||||||
if (!entity.level().isClientSide() && entity.getServer() != null) {
|
if (!entity.level().isClientSide() && entity.getServer() != null) {
|
||||||
|
@ -32,19 +32,19 @@ public class Hk416WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
|
||||||
}
|
}
|
||||||
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
||||||
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") > 0) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") > 0) {
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", (itemstack.getOrCreateTag().getDouble("reloadtime") - 1));
|
itemstack.getOrCreateTag().putDouble("reloading_time", (itemstack.getOrCreateTag().getDouble("reloading_time") - 1));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
itemstack.getOrCreateTag().putDouble("reloading", 0);
|
itemstack.getOrCreateTag().putBoolean("reloading", false);
|
||||||
itemstack.getOrCreateTag().putDouble("emptyreload", 0);
|
itemstack.getOrCreateTag().putBoolean("empty_reload", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", 0);
|
itemstack.getOrCreateTag().putDouble("reloading_time", 0);
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
GunReload.reload(entity, GunInfo.Type.RIFLE);
|
GunReload.reload(entity, GunInfo.Type.RIFLE);
|
||||||
}
|
}
|
||||||
} else if (itemstack.getOrCreateTag().getDouble("reloading") == 1 && itemstack.getOrCreateTag().getInt("ammo") > 0) {
|
} else if (itemstack.getOrCreateTag().getBoolean("reloading") && itemstack.getOrCreateTag().getInt("ammo") > 0) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 41) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 41) {
|
||||||
entity.getPersistentData().putDouble("id", id);
|
entity.getPersistentData().putDouble("id", id);
|
||||||
{
|
{
|
||||||
if (!entity.level().isClientSide() && entity.getServer() != null) {
|
if (!entity.level().isClientSide() && entity.getServer() != null) {
|
||||||
|
@ -55,15 +55,15 @@ public class Hk416WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
|
||||||
}
|
}
|
||||||
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
||||||
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") > 0) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") > 0) {
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", (itemstack.getOrCreateTag().getDouble("reloadtime") - 1));
|
itemstack.getOrCreateTag().putDouble("reloading_time", (itemstack.getOrCreateTag().getDouble("reloading_time") - 1));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
itemstack.getOrCreateTag().putDouble("reloading", 0);
|
itemstack.getOrCreateTag().putBoolean("reloading", false);
|
||||||
itemstack.getOrCreateTag().putDouble("emptyreload", 0);
|
itemstack.getOrCreateTag().putBoolean("empty_reload", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", 0);
|
itemstack.getOrCreateTag().putDouble("reloading_time", 0);
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
GunReload.reload(entity, GunInfo.Type.RIFLE, true);
|
GunReload.reload(entity, GunInfo.Type.RIFLE, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,12 +16,12 @@ public class KraberWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
|
||||||
double id = 0;
|
double id = 0;
|
||||||
id = itemstack.getOrCreateTag().getDouble("id");
|
id = itemstack.getOrCreateTag().getDouble("id");
|
||||||
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") != itemstack.getOrCreateTag().getDouble("id")) {
|
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") != itemstack.getOrCreateTag().getDouble("id")) {
|
||||||
itemstack.getOrCreateTag().putDouble("emptyreload", 0);
|
itemstack.getOrCreateTag().putBoolean("empty_reload", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloading", 0);
|
itemstack.getOrCreateTag().putBoolean("reloading", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", 0);
|
itemstack.getOrCreateTag().putDouble("reloading_time", 0);
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloading") == 1 && itemstack.getOrCreateTag().getInt("ammo") == 0) {
|
if (itemstack.getOrCreateTag().getBoolean("reloading") && itemstack.getOrCreateTag().getInt("ammo") == 0) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 83) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 83) {
|
||||||
entity.getPersistentData().putDouble("id", id);
|
entity.getPersistentData().putDouble("id", id);
|
||||||
{
|
{
|
||||||
if (!entity.level().isClientSide() && entity.getServer() != null) {
|
if (!entity.level().isClientSide() && entity.getServer() != null) {
|
||||||
|
@ -32,19 +32,19 @@ public class KraberWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
|
||||||
}
|
}
|
||||||
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
||||||
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") > 0) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") > 0) {
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", (itemstack.getOrCreateTag().getDouble("reloadtime") - 1));
|
itemstack.getOrCreateTag().putDouble("reloading_time", (itemstack.getOrCreateTag().getDouble("reloading_time") - 1));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
itemstack.getOrCreateTag().putDouble("emptyreload", 0);
|
itemstack.getOrCreateTag().putBoolean("empty_reload", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloading", 0);
|
itemstack.getOrCreateTag().putBoolean("reloading", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", 0);
|
itemstack.getOrCreateTag().putDouble("reloading_time", 0);
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
GunReload.reload(entity, GunInfo.Type.SNIPER);
|
GunReload.reload(entity, GunInfo.Type.SNIPER);
|
||||||
}
|
}
|
||||||
} else if (itemstack.getOrCreateTag().getDouble("reloading") == 1 && itemstack.getOrCreateTag().getInt("ammo") > 0) {
|
} else if (itemstack.getOrCreateTag().getBoolean("reloading") && itemstack.getOrCreateTag().getInt("ammo") > 0) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 65) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 65) {
|
||||||
entity.getPersistentData().putDouble("id", id);
|
entity.getPersistentData().putDouble("id", id);
|
||||||
{
|
{
|
||||||
if (!entity.level().isClientSide() && entity.getServer() != null) {
|
if (!entity.level().isClientSide() && entity.getServer() != null) {
|
||||||
|
@ -55,15 +55,15 @@ public class KraberWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
|
||||||
}
|
}
|
||||||
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
||||||
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") > 0) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") > 0) {
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", (itemstack.getOrCreateTag().getDouble("reloadtime") - 1));
|
itemstack.getOrCreateTag().putDouble("reloading_time", (itemstack.getOrCreateTag().getDouble("reloading_time") - 1));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
itemstack.getOrCreateTag().putDouble("reloading", 0);
|
itemstack.getOrCreateTag().putBoolean("reloading", false);
|
||||||
itemstack.getOrCreateTag().putDouble("emptyreload", 0);
|
itemstack.getOrCreateTag().putBoolean("empty_reload", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", 0);
|
itemstack.getOrCreateTag().putDouble("reloading_time", 0);
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
GunReload.reload(entity, GunInfo.Type.SNIPER, true);
|
GunReload.reload(entity, GunInfo.Type.SNIPER, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,12 +16,12 @@ public class M4WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
|
||||||
double id;
|
double id;
|
||||||
id = itemstack.getOrCreateTag().getDouble("id");
|
id = itemstack.getOrCreateTag().getDouble("id");
|
||||||
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") != itemstack.getOrCreateTag().getDouble("id")) {
|
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") != itemstack.getOrCreateTag().getDouble("id")) {
|
||||||
itemstack.getOrCreateTag().putDouble("emptyreload", 0);
|
itemstack.getOrCreateTag().putBoolean("empty_reload", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloading", 0);
|
itemstack.getOrCreateTag().putBoolean("reloading", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", 0);
|
itemstack.getOrCreateTag().putDouble("reloading_time", 0);
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloading") == 1 && itemstack.getOrCreateTag().getInt("ammo") == 0) {
|
if (itemstack.getOrCreateTag().getBoolean("reloading") && itemstack.getOrCreateTag().getInt("ammo") == 0) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 55) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 55) {
|
||||||
{
|
{
|
||||||
if (!entity.level().isClientSide() && entity.getServer() != null) {
|
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,
|
entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4,
|
||||||
|
@ -32,19 +32,19 @@ public class M4WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
|
||||||
}
|
}
|
||||||
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
||||||
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") > 0) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") > 0) {
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", (itemstack.getOrCreateTag().getDouble("reloadtime") - 1));
|
itemstack.getOrCreateTag().putDouble("reloading_time", (itemstack.getOrCreateTag().getDouble("reloading_time") - 1));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
itemstack.getOrCreateTag().putDouble("reloading", 0);
|
itemstack.getOrCreateTag().putBoolean("reloading", false);
|
||||||
itemstack.getOrCreateTag().putDouble("emptyreload", 0);
|
itemstack.getOrCreateTag().putBoolean("empty_reload", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", 0);
|
itemstack.getOrCreateTag().putDouble("reloading_time", 0);
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
GunReload.reload(entity, GunInfo.Type.RIFLE);
|
GunReload.reload(entity, GunInfo.Type.RIFLE);
|
||||||
}
|
}
|
||||||
} else if (itemstack.getOrCreateTag().getDouble("reloading") == 1 && itemstack.getOrCreateTag().getInt("ammo") > 0) {
|
} else if (itemstack.getOrCreateTag().getBoolean("reloading") && itemstack.getOrCreateTag().getInt("ammo") > 0) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 41) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 41) {
|
||||||
{
|
{
|
||||||
if (!entity.level().isClientSide() && entity.getServer() != null) {
|
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,
|
entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4,
|
||||||
|
@ -55,15 +55,15 @@ public class M4WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
|
||||||
}
|
}
|
||||||
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
||||||
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") > 0) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") > 0) {
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", (itemstack.getOrCreateTag().getDouble("reloadtime") - 1));
|
itemstack.getOrCreateTag().putDouble("reloading_time", (itemstack.getOrCreateTag().getDouble("reloading_time") - 1));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
itemstack.getOrCreateTag().putDouble("reloading", 0);
|
itemstack.getOrCreateTag().putBoolean("reloading", false);
|
||||||
itemstack.getOrCreateTag().putDouble("emptyreload", 0);
|
itemstack.getOrCreateTag().putBoolean("empty_reload", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", 0);
|
itemstack.getOrCreateTag().putDouble("reloading_time", 0);
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
GunReload.reload(entity, GunInfo.Type.RIFLE, true);
|
GunReload.reload(entity, GunInfo.Type.RIFLE, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,12 +16,12 @@ public class M60WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
|
||||||
double id = 0;
|
double id = 0;
|
||||||
id = itemstack.getOrCreateTag().getDouble("id");
|
id = itemstack.getOrCreateTag().getDouble("id");
|
||||||
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") != itemstack.getOrCreateTag().getDouble("id")) {
|
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") != itemstack.getOrCreateTag().getDouble("id")) {
|
||||||
itemstack.getOrCreateTag().putDouble("emptyreload", 0);
|
itemstack.getOrCreateTag().putBoolean("empty_reload", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloading", 0);
|
itemstack.getOrCreateTag().putBoolean("reloading", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", 0);
|
itemstack.getOrCreateTag().putDouble("reloading_time", 0);
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloading") == 1 && itemstack.getOrCreateTag().getInt("ammo") == 0) {
|
if (itemstack.getOrCreateTag().getBoolean("reloading") && itemstack.getOrCreateTag().getInt("ammo") == 0) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 129) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 129) {
|
||||||
entity.getPersistentData().putDouble("id", id);
|
entity.getPersistentData().putDouble("id", id);
|
||||||
{
|
{
|
||||||
if (!entity.level().isClientSide() && entity.getServer() != null) {
|
if (!entity.level().isClientSide() && entity.getServer() != null) {
|
||||||
|
@ -30,24 +30,24 @@ public class M60WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") <= 55) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") <= 55) {
|
||||||
itemstack.getOrCreateTag().putDouble("empty", 0);
|
itemstack.getOrCreateTag().putDouble("empty", 0);
|
||||||
}
|
}
|
||||||
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
||||||
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") > 0) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") > 0) {
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", (itemstack.getOrCreateTag().getDouble("reloadtime") - 1));
|
itemstack.getOrCreateTag().putDouble("reloading_time", (itemstack.getOrCreateTag().getDouble("reloading_time") - 1));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
itemstack.getOrCreateTag().putDouble("reloading", 0);
|
itemstack.getOrCreateTag().putBoolean("reloading", false);
|
||||||
itemstack.getOrCreateTag().putDouble("emptyreload", 0);
|
itemstack.getOrCreateTag().putBoolean("empty_reload", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", 0);
|
itemstack.getOrCreateTag().putDouble("reloading_time", 0);
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
GunReload.reload(entity, GunInfo.Type.RIFLE);
|
GunReload.reload(entity, GunInfo.Type.RIFLE);
|
||||||
}
|
}
|
||||||
} else if (itemstack.getOrCreateTag().getDouble("reloading") == 1 && itemstack.getOrCreateTag().getInt("ammo") > 0) {
|
} else if (itemstack.getOrCreateTag().getBoolean("reloading") && itemstack.getOrCreateTag().getInt("ammo") > 0) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 111) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 111) {
|
||||||
entity.getPersistentData().putDouble("id", id);
|
entity.getPersistentData().putDouble("id", id);
|
||||||
{
|
{
|
||||||
if (!entity.level().isClientSide() && entity.getServer() != null) {
|
if (!entity.level().isClientSide() && entity.getServer() != null) {
|
||||||
|
@ -58,15 +58,15 @@ public class M60WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
|
||||||
}
|
}
|
||||||
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
||||||
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") > 0) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") > 0) {
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", (itemstack.getOrCreateTag().getDouble("reloadtime") - 1));
|
itemstack.getOrCreateTag().putDouble("reloading_time", (itemstack.getOrCreateTag().getDouble("reloading_time") - 1));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
itemstack.getOrCreateTag().putDouble("reloading", 0);
|
itemstack.getOrCreateTag().putBoolean("reloading", false);
|
||||||
itemstack.getOrCreateTag().putDouble("emptyreload", 0);
|
itemstack.getOrCreateTag().putBoolean("empty_reload", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", 0);
|
itemstack.getOrCreateTag().putDouble("reloading_time", 0);
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
GunReload.reload(entity, GunInfo.Type.RIFLE);
|
GunReload.reload(entity, GunInfo.Type.RIFLE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,12 +16,12 @@ public class M79WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
|
||||||
double id = itemstack.getOrCreateTag().getDouble("id");
|
double id = itemstack.getOrCreateTag().getDouble("id");
|
||||||
int ammo1 = 1 - itemstack.getOrCreateTag().getInt("ammo");
|
int ammo1 = 1 - itemstack.getOrCreateTag().getInt("ammo");
|
||||||
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") != itemstack.getOrCreateTag().getDouble("id")) {
|
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") != itemstack.getOrCreateTag().getDouble("id")) {
|
||||||
itemstack.getOrCreateTag().putDouble("emptyreload", 0);
|
itemstack.getOrCreateTag().putBoolean("empty_reload", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloading", 0);
|
itemstack.getOrCreateTag().putBoolean("reloading", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", 0);
|
itemstack.getOrCreateTag().putDouble("reloading_time", 0);
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloading") == 1) {
|
if (itemstack.getOrCreateTag().getBoolean("reloading")) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 86) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 86) {
|
||||||
entity.getPersistentData().putDouble("id", id);
|
entity.getPersistentData().putDouble("id", id);
|
||||||
{
|
{
|
||||||
if (!entity.level().isClientSide() && entity.getServer() != null) {
|
if (!entity.level().isClientSide() && entity.getServer() != null) {
|
||||||
|
@ -32,31 +32,31 @@ public class M79WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
|
||||||
}
|
}
|
||||||
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
||||||
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") > 0) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") > 0) {
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", (itemstack.getOrCreateTag().getDouble("reloadtime") - 1));
|
itemstack.getOrCreateTag().putDouble("reloading_time", (itemstack.getOrCreateTag().getDouble("reloading_time") - 1));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
itemstack.getOrCreateTag().putDouble("reloading", 0);
|
itemstack.getOrCreateTag().putBoolean("reloading", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", 0);
|
itemstack.getOrCreateTag().putDouble("reloading_time", 0);
|
||||||
itemstack.getOrCreateTag().putDouble("emptyreload", 0);
|
itemstack.getOrCreateTag().putBoolean("empty_reload", false);
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
if (itemstack.getOrCreateTag().getInt("maxammo") >= ammo1) {
|
if (itemstack.getOrCreateTag().getInt("maxammo") >= ammo1) {
|
||||||
itemstack.getOrCreateTag().putInt("ammo", (itemstack.getOrCreateTag().getInt("ammo") + ammo1));
|
itemstack.getOrCreateTag().putInt("ammo", (itemstack.getOrCreateTag().getInt("ammo") + ammo1));
|
||||||
if (entity instanceof Player _player) {
|
if (entity instanceof Player _player) {
|
||||||
ItemStack _stktoremove = new ItemStack(TargetModItems.GRENADE_40MM.get());
|
ItemStack _stktoremove = new ItemStack(TargetModItems.GRENADE_40MM.get());
|
||||||
_player.getInventory().clearOrCountMatchingItems(p -> _stktoremove.getItem() == p.getItem(), 1, _player.inventoryMenu.getCraftSlots());
|
_player.getInventory().clearOrCountMatchingItems(p -> _stktoremove.getItem() == p.getItem(), 1, _player.inventoryMenu.getCraftSlots());
|
||||||
}
|
}
|
||||||
itemstack.getOrCreateTag().putDouble("reloading", 0);
|
itemstack.getOrCreateTag().putBoolean("reloading", false);
|
||||||
itemstack.getOrCreateTag().putDouble("emptyreload", 0);
|
itemstack.getOrCreateTag().putBoolean("empty_reload", false);
|
||||||
} else {
|
} else {
|
||||||
itemstack.getOrCreateTag().putInt("ammo", (itemstack.getOrCreateTag().getInt("ammo") + itemstack.getOrCreateTag().getInt("maxammo")));
|
itemstack.getOrCreateTag().putInt("ammo", (itemstack.getOrCreateTag().getInt("ammo") + itemstack.getOrCreateTag().getInt("maxammo")));
|
||||||
if (entity instanceof Player _player) {
|
if (entity instanceof Player _player) {
|
||||||
ItemStack _stktoremove = new ItemStack(TargetModItems.GRENADE_40MM.get());
|
ItemStack _stktoremove = new ItemStack(TargetModItems.GRENADE_40MM.get());
|
||||||
_player.getInventory().clearOrCountMatchingItems(p -> _stktoremove.getItem() == p.getItem(), 1, _player.inventoryMenu.getCraftSlots());
|
_player.getInventory().clearOrCountMatchingItems(p -> _stktoremove.getItem() == p.getItem(), 1, _player.inventoryMenu.getCraftSlots());
|
||||||
}
|
}
|
||||||
itemstack.getOrCreateTag().putDouble("reloading", 0);
|
itemstack.getOrCreateTag().putBoolean("reloading", false);
|
||||||
itemstack.getOrCreateTag().putDouble("emptyreload", 0);
|
itemstack.getOrCreateTag().putBoolean("empty_reload", false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,7 +21,7 @@ public class M79fireProcedure {
|
||||||
if (entity == null) return;
|
if (entity == null) return;
|
||||||
if (entity instanceof Player player && !player.isSpectator()) {
|
if (entity instanceof Player player && !player.isSpectator()) {
|
||||||
ItemStack usehand = player.getMainHandItem();
|
ItemStack usehand = player.getMainHandItem();
|
||||||
if (usehand.getItem() == TargetModItems.M_79.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && !(entity instanceof Player _plrCldCheck4 && _plrCldCheck4.getCooldowns().isOnCooldown(usehand.getItem()))
|
if (usehand.getItem() == TargetModItems.M_79.get() && !usehand.getOrCreateTag().getBoolean("reloading") && !(entity instanceof Player _plrCldCheck4 && _plrCldCheck4.getCooldowns().isOnCooldown(usehand.getItem()))
|
||||||
&& usehand.getOrCreateTag().getInt("ammo") > 0) {
|
&& usehand.getOrCreateTag().getInt("ammo") > 0) {
|
||||||
entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
|
entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
|
||||||
capability.recoilHorizon = Math.random() < 0.5 ? -1 : 1;
|
capability.recoilHorizon = Math.random() < 0.5 ? -1 : 1;
|
||||||
|
@ -41,7 +41,7 @@ public class M79fireProcedure {
|
||||||
entityToSpawn.setSilent(true);
|
entityToSpawn.setSilent(true);
|
||||||
return entityToSpawn;
|
return entityToSpawn;
|
||||||
}
|
}
|
||||||
}.getArrow(projectileLevel, entity, (float) ((usehand.getOrCreateTag().getDouble("damage") / usehand.getOrCreateTag().getDouble("velocity")) * (1 + 0.05 * usehand.getOrCreateTag().getDouble("level"))), 0);
|
}.getArrow(projectileLevel, entity, (float) ((usehand.getOrCreateTag().getDouble("damage") / usehand.getOrCreateTag().getDouble("velocity")) * (1 + 0.05 * usehand.getOrCreateTag().getInt("level"))), 0);
|
||||||
_entityToSpawn.setPos(entity.getX(), entity.getEyeY() - 0.1, entity.getZ());
|
_entityToSpawn.setPos(entity.getX(), entity.getEyeY() - 0.1, entity.getZ());
|
||||||
_entityToSpawn.shoot(entity.getLookAngle().x, entity.getLookAngle().y, entity.getLookAngle().z, (float) usehand.getOrCreateTag().getDouble("velocity"),
|
_entityToSpawn.shoot(entity.getLookAngle().x, entity.getLookAngle().y, entity.getLookAngle().z, (float) usehand.getOrCreateTag().getDouble("velocity"),
|
||||||
(float) ((LivingEntity) entity).getAttribute(TargetModAttributes.SPREAD.get()).getBaseValue());
|
(float) ((LivingEntity) entity).getAttribute(TargetModAttributes.SPREAD.get()).getBaseValue());
|
||||||
|
@ -67,7 +67,7 @@ public class M79fireProcedure {
|
||||||
entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4,
|
entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4,
|
||||||
entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:m_79_veryfar player @a ~ ~ ~ 12 1");
|
entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:m_79_veryfar player @a ~ ~ ~ 12 1");
|
||||||
}
|
}
|
||||||
usehand.getOrCreateTag().putDouble("fireanim", 2);
|
usehand.getOrCreateTag().putInt("fire_animation", 2);
|
||||||
usehand.getOrCreateTag().putInt("ammo", (usehand.getOrCreateTag().getInt("ammo") - 1));
|
usehand.getOrCreateTag().putInt("ammo", (usehand.getOrCreateTag().getInt("ammo") - 1));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -19,12 +19,12 @@ public class M870WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
|
||||||
ammo1 = 8 - itemstack.getOrCreateTag().getInt("ammo");
|
ammo1 = 8 - itemstack.getOrCreateTag().getInt("ammo");
|
||||||
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") != itemstack.getOrCreateTag().getDouble("id")) {
|
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") != itemstack.getOrCreateTag().getDouble("id")) {
|
||||||
itemstack.getOrCreateTag().putDouble("finish", 0);
|
itemstack.getOrCreateTag().putDouble("finish", 0);
|
||||||
itemstack.getOrCreateTag().putDouble("reloading", 0);
|
itemstack.getOrCreateTag().putBoolean("reloading", false);
|
||||||
itemstack.getOrCreateTag().putDouble("prepare", 0);
|
itemstack.getOrCreateTag().putDouble("prepare", 0);
|
||||||
itemstack.getOrCreateTag().putDouble("loading", 0);
|
itemstack.getOrCreateTag().putDouble("loading", 0);
|
||||||
itemstack.getOrCreateTag().putDouble("forcestop", 0);
|
itemstack.getOrCreateTag().putDouble("forcestop", 0);
|
||||||
itemstack.getOrCreateTag().putDouble("stop", 0);
|
itemstack.getOrCreateTag().putDouble("stop", 0);
|
||||||
itemstack.getOrCreateTag().putDouble("emptyreload", 0);
|
itemstack.getOrCreateTag().putBoolean("empty_reload", false);
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("prepare") > 0) {
|
if (itemstack.getOrCreateTag().getDouble("prepare") > 0) {
|
||||||
itemstack.getOrCreateTag().putDouble("prepare", (itemstack.getOrCreateTag().getDouble("prepare") - 1));
|
itemstack.getOrCreateTag().putDouble("prepare", (itemstack.getOrCreateTag().getDouble("prepare") - 1));
|
||||||
|
@ -36,10 +36,10 @@ public class M870WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
|
||||||
itemstack.getOrCreateTag().putDouble("finish", (itemstack.getOrCreateTag().getDouble("finish") - 1));
|
itemstack.getOrCreateTag().putDouble("finish", (itemstack.getOrCreateTag().getDouble("finish") - 1));
|
||||||
}
|
}
|
||||||
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") != itemstack.getOrCreateTag().getDouble("id")) {
|
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") != itemstack.getOrCreateTag().getDouble("id")) {
|
||||||
itemstack.getOrCreateTag().putDouble("reloading", 0);
|
itemstack.getOrCreateTag().putBoolean("reloading", false);
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloading") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
if (itemstack.getOrCreateTag().getBoolean("reloading") && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("prepare") == 10 && itemstack.getOrCreateTag().getDouble("emptyreload") == 1) {
|
if (itemstack.getOrCreateTag().getDouble("prepare") == 10 && itemstack.getOrCreateTag().getBoolean("empty_reload")) {
|
||||||
itemstack.getOrCreateTag().putInt("ammo", (itemstack.getOrCreateTag().getInt("ammo") + 1));
|
itemstack.getOrCreateTag().putInt("ammo", (itemstack.getOrCreateTag().getInt("ammo") + 1));
|
||||||
{
|
{
|
||||||
int _setval = (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).shotgunAmmo - 1;
|
int _setval = (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).shotgunAmmo - 1;
|
||||||
|
@ -63,10 +63,10 @@ public class M870WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
|
||||||
entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:m_870_reloadloop player @s ~ ~ ~ 100 1");
|
entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:m_870_reloadloop player @s ~ ~ ~ 100 1");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("loadindex") == 0) {
|
if (itemstack.getOrCreateTag().getBoolean("load_index")) {
|
||||||
itemstack.getOrCreateTag().putDouble("loadindex", 1);
|
itemstack.getOrCreateTag().putBoolean("load_index", true);
|
||||||
} else {
|
} else {
|
||||||
itemstack.getOrCreateTag().putDouble("loadindex", 0);
|
itemstack.getOrCreateTag().putBoolean("load_index", false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -87,8 +87,8 @@ public class M870WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
|
||||||
itemstack.getOrCreateTag().putDouble("finish", 12);
|
itemstack.getOrCreateTag().putDouble("finish", 12);
|
||||||
if (entity instanceof Player _player)
|
if (entity instanceof Player _player)
|
||||||
_player.getCooldowns().addCooldown(itemstack.getItem(), 12);
|
_player.getCooldowns().addCooldown(itemstack.getItem(), 12);
|
||||||
itemstack.getOrCreateTag().putDouble("reloading", 0);
|
itemstack.getOrCreateTag().putBoolean("reloading", false);
|
||||||
itemstack.getOrCreateTag().putDouble("emptyreload", 0);
|
itemstack.getOrCreateTag().putBoolean("empty_reload", false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("firing") > 0) {
|
if (itemstack.getOrCreateTag().getDouble("firing") > 0) {
|
||||||
|
|
|
@ -13,10 +13,10 @@ public class M870fireProcedure {
|
||||||
if (player.isSpectator()) return;
|
if (player.isSpectator()) return;
|
||||||
|
|
||||||
ItemStack usehand = player.getMainHandItem();
|
ItemStack usehand = player.getMainHandItem();
|
||||||
if (usehand.getOrCreateTag().getDouble("reloading") == 1 && usehand.getOrCreateTag().getDouble("prepare") == 0 && usehand.getOrCreateTag().getInt("ammo") > 0) {
|
if (usehand.getOrCreateTag().getBoolean("reloading") && usehand.getOrCreateTag().getDouble("prepare") == 0 && usehand.getOrCreateTag().getInt("ammo") > 0) {
|
||||||
usehand.getOrCreateTag().putDouble("forcestop", 1);
|
usehand.getOrCreateTag().putDouble("forcestop", 1);
|
||||||
}
|
}
|
||||||
if (usehand.getItem() == TargetModItems.M_870.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && !player.getCooldowns().isOnCooldown(usehand.getItem())
|
if (usehand.getItem() == TargetModItems.M_870.get() && !usehand.getOrCreateTag().getBoolean("reloading") && !player.getCooldowns().isOnCooldown(usehand.getItem())
|
||||||
&& usehand.getOrCreateTag().getInt("ammo") > 0) {
|
&& usehand.getOrCreateTag().getInt("ammo") > 0) {
|
||||||
for (int index0 = 0; index0 < 12; index0++) {
|
for (int index0 = 0; index0 < 12; index0++) {
|
||||||
GunsTool.spawnBullet(player);
|
GunsTool.spawnBullet(player);
|
||||||
|
@ -36,7 +36,7 @@ public class M870fireProcedure {
|
||||||
player.getName().getString(), player.getDisplayName(), player.level().getServer(), player), "playsound target:m_870_veryfar player @a ~ ~ ~ 24 1");
|
player.getName().getString(), player.getDisplayName(), player.level().getServer(), player), "playsound target:m_870_veryfar player @a ~ ~ ~ 24 1");
|
||||||
}
|
}
|
||||||
usehand.getOrCreateTag().putInt("ammo", (usehand.getOrCreateTag().getInt("ammo") - 1));
|
usehand.getOrCreateTag().putInt("ammo", (usehand.getOrCreateTag().getInt("ammo") - 1));
|
||||||
usehand.getOrCreateTag().putDouble("fireanim", 2);
|
usehand.getOrCreateTag().putInt("fire_animation", 2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,12 +20,12 @@ public class M98bWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
|
||||||
ammo1 = 5 - itemstack.getOrCreateTag().getInt("ammo");
|
ammo1 = 5 - itemstack.getOrCreateTag().getInt("ammo");
|
||||||
ammo2 = 6 - itemstack.getOrCreateTag().getInt("ammo");
|
ammo2 = 6 - itemstack.getOrCreateTag().getInt("ammo");
|
||||||
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") != itemstack.getOrCreateTag().getDouble("id")) {
|
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") != itemstack.getOrCreateTag().getDouble("id")) {
|
||||||
itemstack.getOrCreateTag().putDouble("emptyreload", 0);
|
itemstack.getOrCreateTag().putBoolean("empty_reload", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloading", 0);
|
itemstack.getOrCreateTag().putBoolean("reloading", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", 0);
|
itemstack.getOrCreateTag().putDouble("reloading_time", 0);
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloading") == 1 && itemstack.getOrCreateTag().getInt("ammo") == 0) {
|
if (itemstack.getOrCreateTag().getBoolean("reloading") && itemstack.getOrCreateTag().getInt("ammo") == 0) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 79) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 79) {
|
||||||
entity.getPersistentData().putDouble("id", id);
|
entity.getPersistentData().putDouble("id", id);
|
||||||
{
|
{
|
||||||
if (!entity.level().isClientSide() && entity.getServer() != null) {
|
if (!entity.level().isClientSide() && entity.getServer() != null) {
|
||||||
|
@ -36,19 +36,19 @@ public class M98bWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
|
||||||
}
|
}
|
||||||
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
||||||
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") > 0) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") > 0) {
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", (itemstack.getOrCreateTag().getDouble("reloadtime") - 1));
|
itemstack.getOrCreateTag().putDouble("reloading_time", (itemstack.getOrCreateTag().getDouble("reloading_time") - 1));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
itemstack.getOrCreateTag().putDouble("reloading", 0);
|
itemstack.getOrCreateTag().putBoolean("reloading", false);
|
||||||
itemstack.getOrCreateTag().putDouble("emptyreload", 0);
|
itemstack.getOrCreateTag().putBoolean("empty_reload", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", 0);
|
itemstack.getOrCreateTag().putDouble("reloading_time", 0);
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
GunReload.reload(entity, GunInfo.Type.SNIPER);
|
GunReload.reload(entity, GunInfo.Type.SNIPER);
|
||||||
}
|
}
|
||||||
} else if (itemstack.getOrCreateTag().getDouble("reloading") == 1 && itemstack.getOrCreateTag().getInt("ammo") > 0) {
|
} else if (itemstack.getOrCreateTag().getBoolean("reloading") && itemstack.getOrCreateTag().getInt("ammo") > 0) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 57) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 57) {
|
||||||
entity.getPersistentData().putDouble("id", id);
|
entity.getPersistentData().putDouble("id", id);
|
||||||
{
|
{
|
||||||
if (!entity.level().isClientSide() && entity.getServer() != null) {
|
if (!entity.level().isClientSide() && entity.getServer() != null) {
|
||||||
|
@ -59,15 +59,15 @@ public class M98bWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
|
||||||
}
|
}
|
||||||
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
||||||
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") > 0) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") > 0) {
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", (itemstack.getOrCreateTag().getDouble("reloadtime") - 1));
|
itemstack.getOrCreateTag().putDouble("reloading_time", (itemstack.getOrCreateTag().getDouble("reloading_time") - 1));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
itemstack.getOrCreateTag().putDouble("reloading", 0);
|
itemstack.getOrCreateTag().putBoolean("reloading", false);
|
||||||
itemstack.getOrCreateTag().putDouble("emptyreload", 0);
|
itemstack.getOrCreateTag().putBoolean("empty_reload", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", 0);
|
itemstack.getOrCreateTag().putDouble("reloading_time", 0);
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
GunReload.reload(entity, GunInfo.Type.SNIPER, true);
|
GunReload.reload(entity, GunInfo.Type.SNIPER, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,7 +17,7 @@ public class MarlinWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
|
||||||
itemstack.getOrCreateTag().getInt("ammo");
|
itemstack.getOrCreateTag().getInt("ammo");
|
||||||
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") != itemstack.getOrCreateTag().getDouble("id")) {
|
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") != itemstack.getOrCreateTag().getDouble("id")) {
|
||||||
itemstack.getOrCreateTag().putDouble("finish", 0);
|
itemstack.getOrCreateTag().putDouble("finish", 0);
|
||||||
itemstack.getOrCreateTag().putDouble("reloading", 0);
|
itemstack.getOrCreateTag().putBoolean("reloading", false);
|
||||||
itemstack.getOrCreateTag().putDouble("prepare", 0);
|
itemstack.getOrCreateTag().putDouble("prepare", 0);
|
||||||
itemstack.getOrCreateTag().putDouble("loading", 0);
|
itemstack.getOrCreateTag().putDouble("loading", 0);
|
||||||
itemstack.getOrCreateTag().putDouble("forcestop", 0);
|
itemstack.getOrCreateTag().putDouble("forcestop", 0);
|
||||||
|
@ -33,9 +33,9 @@ public class MarlinWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
|
||||||
itemstack.getOrCreateTag().putDouble("finish", (itemstack.getOrCreateTag().getDouble("finish") - 1));
|
itemstack.getOrCreateTag().putDouble("finish", (itemstack.getOrCreateTag().getDouble("finish") - 1));
|
||||||
}
|
}
|
||||||
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") != itemstack.getOrCreateTag().getDouble("id")) {
|
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") != itemstack.getOrCreateTag().getDouble("id")) {
|
||||||
itemstack.getOrCreateTag().putDouble("reloading", 0);
|
itemstack.getOrCreateTag().putBoolean("reloading", false);
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloading") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
if (itemstack.getOrCreateTag().getBoolean("reloading") && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("prepare") == 0 && itemstack.getOrCreateTag().getDouble("loading") == 0
|
if (itemstack.getOrCreateTag().getDouble("prepare") == 0 && itemstack.getOrCreateTag().getDouble("loading") == 0
|
||||||
&& !(itemstack.getOrCreateTag().getInt("ammo") >= 8 || (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleAmmo == 0)) {
|
&& !(itemstack.getOrCreateTag().getInt("ammo") >= 8 || (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleAmmo == 0)) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("forcestop") == 1) {
|
if (itemstack.getOrCreateTag().getDouble("forcestop") == 1) {
|
||||||
|
@ -50,10 +50,10 @@ public class MarlinWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
|
||||||
entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:marlin_loop player @s ~ ~ ~ 100 1");
|
entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:marlin_loop player @s ~ ~ ~ 100 1");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("loadindex") == 0) {
|
if (itemstack.getOrCreateTag().getBoolean("load_index")) {
|
||||||
itemstack.getOrCreateTag().putDouble("loadindex", 1);
|
itemstack.getOrCreateTag().putBoolean("load_index", true);
|
||||||
} else {
|
} else {
|
||||||
itemstack.getOrCreateTag().putDouble("loadindex", 0);
|
itemstack.getOrCreateTag().putBoolean("load_index", false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -74,7 +74,7 @@ public class MarlinWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
|
||||||
itemstack.getOrCreateTag().putDouble("finish", 19);
|
itemstack.getOrCreateTag().putDouble("finish", 19);
|
||||||
if (entity instanceof Player _player)
|
if (entity instanceof Player _player)
|
||||||
_player.getCooldowns().addCooldown(itemstack.getItem(), 19);
|
_player.getCooldowns().addCooldown(itemstack.getItem(), 19);
|
||||||
itemstack.getOrCreateTag().putDouble("reloading", 0);
|
itemstack.getOrCreateTag().putBoolean("reloading", false);
|
||||||
{
|
{
|
||||||
if (!entity.level().isClientSide() && entity.getServer() != null) {
|
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,
|
entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4,
|
||||||
|
|
|
@ -14,10 +14,10 @@ public class MarlinfireProcedure {
|
||||||
if (player.isSpectator()) return;
|
if (player.isSpectator()) return;
|
||||||
|
|
||||||
ItemStack usehand = player.getMainHandItem();
|
ItemStack usehand = player.getMainHandItem();
|
||||||
if (usehand.getOrCreateTag().getDouble("reloading") == 1 && usehand.getOrCreateTag().getDouble("prepare") == 0 && usehand.getOrCreateTag().getInt("ammo") > 0) {
|
if (usehand.getOrCreateTag().getBoolean("reloading") && usehand.getOrCreateTag().getDouble("prepare") == 0 && usehand.getOrCreateTag().getInt("ammo") > 0) {
|
||||||
usehand.getOrCreateTag().putDouble("forcestop", 1);
|
usehand.getOrCreateTag().putDouble("forcestop", 1);
|
||||||
}
|
}
|
||||||
if (usehand.getItem() == TargetModItems.MARLIN.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && !player.getCooldowns().isOnCooldown(usehand.getItem())
|
if (usehand.getItem() == TargetModItems.MARLIN.get() && !usehand.getOrCreateTag().getBoolean("reloading") && !player.getCooldowns().isOnCooldown(usehand.getItem())
|
||||||
&& usehand.getOrCreateTag().getInt("ammo") > 0) {
|
&& usehand.getOrCreateTag().getInt("ammo") > 0) {
|
||||||
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
|
if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
|
||||||
player.getCooldowns().addCooldown(usehand.getItem(), 15);
|
player.getCooldowns().addCooldown(usehand.getItem(), 15);
|
||||||
|
@ -46,7 +46,7 @@ public class MarlinfireProcedure {
|
||||||
} else {
|
} else {
|
||||||
usehand.getOrCreateTag().putDouble("animindex", 1);
|
usehand.getOrCreateTag().putDouble("animindex", 1);
|
||||||
}
|
}
|
||||||
usehand.getOrCreateTag().putDouble("fireanim", 2);
|
usehand.getOrCreateTag().putInt("fire_animation", 2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,7 +25,7 @@ public class MinigunautofireProcedure {
|
||||||
ItemStack usehand;
|
ItemStack usehand;
|
||||||
usehand = player.getMainHandItem();
|
usehand = player.getMainHandItem();
|
||||||
if (usehand.getItem() == TargetModItems.MINIGUN.get()) {
|
if (usehand.getItem() == TargetModItems.MINIGUN.get()) {
|
||||||
if (player.getPersistentData().getDouble("minifiring") == 1 && !player.isSprinting()) {
|
if (player.getPersistentData().getDouble("mini_firing") == 1 && !player.isSprinting()) {
|
||||||
if (usehand.getOrCreateTag().getDouble("rot") < 10) {
|
if (usehand.getOrCreateTag().getDouble("rot") < 10) {
|
||||||
usehand.getOrCreateTag().putDouble("rot", (usehand.getOrCreateTag().getDouble("rot") + 1));
|
usehand.getOrCreateTag().putDouble("rot", (usehand.getOrCreateTag().getDouble("rot") + 1));
|
||||||
}
|
}
|
||||||
|
@ -77,7 +77,7 @@ public class MinigunautofireProcedure {
|
||||||
capability.syncPlayerVariables(player);
|
capability.syncPlayerVariables(player);
|
||||||
});
|
});
|
||||||
|
|
||||||
usehand.getOrCreateTag().putDouble("fireanim", 2);
|
usehand.getOrCreateTag().putInt("fire_animation", 2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -11,7 +11,7 @@ public class MinigunfireProcedure {
|
||||||
if (entity instanceof Player player && !player.isSpectator()) {
|
if (entity instanceof Player player && !player.isSpectator()) {
|
||||||
ItemStack usehand = player.getMainHandItem();
|
ItemStack usehand = player.getMainHandItem();
|
||||||
if (usehand.getItem() == TargetModItems.MINIGUN.get()) {
|
if (usehand.getItem() == TargetModItems.MINIGUN.get()) {
|
||||||
entity.getPersistentData().putDouble("minifiring", 1);
|
entity.getPersistentData().putDouble("mini_firing", 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,15 +13,15 @@ public class MiniguninbackpackProcedure {
|
||||||
itemstack.getOrCreateTag().putDouble("heat", (itemstack.getOrCreateTag().getDouble("heat") - 0.5));
|
itemstack.getOrCreateTag().putDouble("heat", (itemstack.getOrCreateTag().getDouble("heat") - 0.5));
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("heat") == 0) {
|
if (itemstack.getOrCreateTag().getDouble("heat") == 0) {
|
||||||
itemstack.getOrCreateTag().putDouble("heatbar", 51);
|
itemstack.getOrCreateTag().putDouble("heat_bar", 51);
|
||||||
} else {
|
} else {
|
||||||
itemstack.getOrCreateTag().putDouble("heatbar", (itemstack.getOrCreateTag().getDouble("heat")));
|
itemstack.getOrCreateTag().putDouble("heat_bar", (itemstack.getOrCreateTag().getDouble("heat")));
|
||||||
}
|
}
|
||||||
if (!((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.MINIGUN.get())) {
|
if (!((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.MINIGUN.get())) {
|
||||||
entity.getPersistentData().putDouble("minigunfiring", 0);
|
entity.getPersistentData().putDouble("minigun_firing", 0);
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("overheat") > 0) {
|
if (itemstack.getOrCreateTag().getDouble("overheat") > 0) {
|
||||||
entity.getPersistentData().putDouble("minifiring", 0);
|
entity.getPersistentData().putDouble("mini_firing", 0);
|
||||||
itemstack.getOrCreateTag().putDouble("overheat", (itemstack.getOrCreateTag().getDouble("overheat") - 1));
|
itemstack.getOrCreateTag().putDouble("overheat", (itemstack.getOrCreateTag().getDouble("overheat") - 1));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,12 +16,12 @@ public class Mk14WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
|
||||||
double id = 0;
|
double id = 0;
|
||||||
id = itemstack.getOrCreateTag().getDouble("id");
|
id = itemstack.getOrCreateTag().getDouble("id");
|
||||||
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") != itemstack.getOrCreateTag().getDouble("id")) {
|
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") != itemstack.getOrCreateTag().getDouble("id")) {
|
||||||
itemstack.getOrCreateTag().putDouble("emptyreload", 0);
|
itemstack.getOrCreateTag().putBoolean("empty_reload", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloading", 0);
|
itemstack.getOrCreateTag().putBoolean("reloading", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", 0);
|
itemstack.getOrCreateTag().putDouble("reloading_time", 0);
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloading") == 1 && itemstack.getOrCreateTag().getInt("ammo") == 0) {
|
if (itemstack.getOrCreateTag().getBoolean("reloading") && itemstack.getOrCreateTag().getInt("ammo") == 0) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 55) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 55) {
|
||||||
entity.getPersistentData().putDouble("id", id);
|
entity.getPersistentData().putDouble("id", id);
|
||||||
{
|
{
|
||||||
if (!entity.level().isClientSide() && entity.getServer() != null) {
|
if (!entity.level().isClientSide() && entity.getServer() != null) {
|
||||||
|
@ -32,22 +32,22 @@ public class Mk14WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
|
||||||
}
|
}
|
||||||
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
||||||
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") > 0) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") > 0) {
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", (itemstack.getOrCreateTag().getDouble("reloadtime") - 1));
|
itemstack.getOrCreateTag().putDouble("reloading_time", (itemstack.getOrCreateTag().getDouble("reloading_time") - 1));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
itemstack.getOrCreateTag().putDouble("reloading", 0);
|
itemstack.getOrCreateTag().putBoolean("reloading", false);
|
||||||
itemstack.getOrCreateTag().putDouble("emptyreload", 0);
|
itemstack.getOrCreateTag().putBoolean("empty_reload", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", 0);
|
itemstack.getOrCreateTag().putDouble("reloading_time", 0);
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 5 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 5 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
itemstack.getOrCreateTag().putDouble("gj", 0);
|
itemstack.getOrCreateTag().putDouble("gj", 0);
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
GunReload.reload(entity, GunInfo.Type.RIFLE);
|
GunReload.reload(entity, GunInfo.Type.RIFLE);
|
||||||
}
|
}
|
||||||
} else if (itemstack.getOrCreateTag().getDouble("reloading") == 1 && itemstack.getOrCreateTag().getInt("ammo") > 0) {
|
} else if (itemstack.getOrCreateTag().getBoolean("reloading") && itemstack.getOrCreateTag().getInt("ammo") > 0) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 45) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 45) {
|
||||||
entity.getPersistentData().putDouble("id", id);
|
entity.getPersistentData().putDouble("id", id);
|
||||||
{
|
{
|
||||||
if (!entity.level().isClientSide() && entity.getServer() != null) {
|
if (!entity.level().isClientSide() && entity.getServer() != null) {
|
||||||
|
@ -58,15 +58,15 @@ public class Mk14WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
|
||||||
}
|
}
|
||||||
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
||||||
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") > 0) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") > 0) {
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", (itemstack.getOrCreateTag().getDouble("reloadtime") - 1));
|
itemstack.getOrCreateTag().putDouble("reloading_time", (itemstack.getOrCreateTag().getDouble("reloading_time") - 1));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
itemstack.getOrCreateTag().putDouble("reloading", 0);
|
itemstack.getOrCreateTag().putBoolean("reloading", false);
|
||||||
itemstack.getOrCreateTag().putDouble("emptyreload", 0);
|
itemstack.getOrCreateTag().putBoolean("empty_reload", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", 0);
|
itemstack.getOrCreateTag().putDouble("reloading_time", 0);
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
GunReload.reload(entity, GunInfo.Type.RIFLE, true);
|
GunReload.reload(entity, GunInfo.Type.RIFLE, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,298 +20,298 @@ public class PlayerReloadProcedure {
|
||||||
|
|
||||||
if (player.getMainHandItem().getItem() == TargetModItems.TASER.get()
|
if (player.getMainHandItem().getItem() == TargetModItems.TASER.get()
|
||||||
&& !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem()))
|
&& !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem()))
|
||||||
&& tag.getDouble("reloading") == 0
|
&& !tag.getBoolean("reloading")
|
||||||
&& tag.getInt("ammo") < 1
|
&& tag.getInt("ammo") < 1
|
||||||
&& tag.getInt("maxammo") > 0) {
|
&& tag.getInt("maxammo") > 0) {
|
||||||
tag.putDouble("reloading", 1);
|
tag.putBoolean("reloading", true);
|
||||||
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
||||||
tag.putDouble("reloadtime", 55);
|
tag.putDouble("reloading_time", 55);
|
||||||
}
|
}
|
||||||
if (player.getMainHandItem().getItem() == TargetModItems.TRACHELIUM.get()
|
if (player.getMainHandItem().getItem() == TargetModItems.TRACHELIUM.get()
|
||||||
&& !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem()))
|
&& !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem()))
|
||||||
&& tag.getDouble("reloading") == 0
|
&& !tag.getBoolean("reloading")
|
||||||
&& tag.getInt("ammo") < 8
|
&& tag.getInt("ammo") < 8
|
||||||
&& (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).handgunAmmo > 0) {
|
&& (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).handgunAmmo > 0) {
|
||||||
tag.putDouble("reloading", 1);
|
tag.putBoolean("reloading", true);
|
||||||
tag.putDouble("emptyreload", 1);
|
tag.putDouble("empty_reload", 1);
|
||||||
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
||||||
tag.putDouble("reloadtime", 57);
|
tag.putDouble("reloading_time", 57);
|
||||||
}
|
}
|
||||||
if (player.getMainHandItem().getItem() == TargetModItems.HUNTING_RIFLE.get()
|
if (player.getMainHandItem().getItem() == TargetModItems.HUNTING_RIFLE.get()
|
||||||
&& !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem()))
|
&& !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem()))
|
||||||
&& tag.getDouble("reloading") == 0
|
&& !tag.getBoolean("reloading")
|
||||||
&& tag.getInt("ammo") < 1
|
&& tag.getInt("ammo") < 1
|
||||||
&& (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).sniperAmmo > 0) {
|
&& (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).sniperAmmo > 0) {
|
||||||
tag.putDouble("reloading", 1);
|
tag.putBoolean("reloading", true);
|
||||||
tag.putDouble("reloadtime", 61);
|
tag.putDouble("reloading_time", 61);
|
||||||
tag.putDouble("emptyreload", 1);
|
tag.putDouble("empty_reload", 1);
|
||||||
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
||||||
}
|
}
|
||||||
if (player.getMainHandItem().getItem() == TargetModItems.M_79.get()
|
if (player.getMainHandItem().getItem() == TargetModItems.M_79.get()
|
||||||
&& !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem()))
|
&& !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem()))
|
||||||
&& tag.getDouble("reloading") == 0
|
&& !tag.getBoolean("reloading")
|
||||||
&& tag.getInt("ammo") < 1
|
&& tag.getInt("ammo") < 1
|
||||||
&& tag.getInt("maxammo") > 0) {
|
&& tag.getInt("maxammo") > 0) {
|
||||||
tag.putDouble("reloading", 1);
|
tag.putBoolean("reloading", true);
|
||||||
tag.putDouble("emptyreload", 1);
|
tag.putDouble("empty_reload", 1);
|
||||||
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
||||||
tag.putDouble("reloadtime", 86);
|
tag.putDouble("reloading_time", 86);
|
||||||
}
|
}
|
||||||
if (player.getMainHandItem().getItem() == TargetModItems.RPG.get()
|
if (player.getMainHandItem().getItem() == TargetModItems.RPG.get()
|
||||||
&& !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem()))
|
&& !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem()))
|
||||||
&& tag.getDouble("reloading") == 0
|
&& !tag.getBoolean("reloading")
|
||||||
&& tag.getInt("ammo") < 1
|
&& tag.getInt("ammo") < 1
|
||||||
&& tag.getInt("maxammo") > 0) {
|
&& tag.getInt("maxammo") > 0) {
|
||||||
tag.putDouble("reloading", 1);
|
tag.putBoolean("reloading", true);
|
||||||
tag.putDouble("emptyreload", 1);
|
tag.putDouble("empty_reload", 1);
|
||||||
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
||||||
tag.putDouble("reloadtime", 91);
|
tag.putDouble("reloading_time", 91);
|
||||||
}
|
}
|
||||||
if (player.getMainHandItem().getItem() == TargetModItems.ABEKIRI.get()
|
if (player.getMainHandItem().getItem() == TargetModItems.ABEKIRI.get()
|
||||||
&& !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem()))
|
&& !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem()))
|
||||||
&& tag.getDouble("reloading") == 0
|
&& !tag.getBoolean("reloading")
|
||||||
&& tag.getInt("ammo") < 2
|
&& tag.getInt("ammo") < 2
|
||||||
&& (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).shotgunAmmo > 0) {
|
&& (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).shotgunAmmo > 0) {
|
||||||
if (tag.getInt("ammo") == 1) {
|
if (tag.getInt("ammo") == 1) {
|
||||||
tag.putDouble("reloading", 1);
|
tag.putBoolean("reloading", true);
|
||||||
tag.putDouble("emptyreload", 0);
|
tag.putBoolean("empty_reload", false);
|
||||||
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
||||||
tag.putDouble("reloadtime", 83);
|
tag.putDouble("reloading_time", 83);
|
||||||
} else if (tag.getInt("ammo") == 0) {
|
} else if (tag.getInt("ammo") == 0) {
|
||||||
tag.putDouble("reloading", 1);
|
tag.putBoolean("reloading", true);
|
||||||
tag.putDouble("emptyreload", 1);
|
tag.putDouble("empty_reload", 1);
|
||||||
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
||||||
tag.putDouble("reloadtime", 99);
|
tag.putDouble("reloading_time", 99);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (player.getMainHandItem().getItem() == TargetModItems.M_98B.get()
|
if (player.getMainHandItem().getItem() == TargetModItems.M_98B.get()
|
||||||
&& !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem()))
|
&& !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem()))
|
||||||
&& tag.getDouble("reloading") == 0
|
&& !tag.getBoolean("reloading")
|
||||||
&& tag.getInt("ammo") < 6
|
&& tag.getInt("ammo") < 6
|
||||||
&& (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).sniperAmmo > 0) {
|
&& (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).sniperAmmo > 0) {
|
||||||
if (tag.getInt("ammo") > 0) {
|
if (tag.getInt("ammo") > 0) {
|
||||||
tag.putDouble("reloading", 1);
|
tag.putBoolean("reloading", true);
|
||||||
tag.putDouble("emptyreload", 0);
|
tag.putBoolean("empty_reload", false);
|
||||||
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
||||||
tag.putDouble("reloadtime", 57);
|
tag.putDouble("reloading_time", 57);
|
||||||
} else if (tag.getInt("ammo") == 0) {
|
} else if (tag.getInt("ammo") == 0) {
|
||||||
tag.putDouble("reloading", 1);
|
tag.putBoolean("reloading", true);
|
||||||
tag.putDouble("emptyreload", 1);
|
tag.putDouble("empty_reload", 1);
|
||||||
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
||||||
tag.putDouble("reloadtime", 79);
|
tag.putDouble("reloading_time", 79);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (player.getMainHandItem().getItem() == TargetModItems.KRABER.get()
|
if (player.getMainHandItem().getItem() == TargetModItems.KRABER.get()
|
||||||
&& !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem()))
|
&& !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem()))
|
||||||
&& tag.getDouble("reloading") == 0
|
&& !tag.getBoolean("reloading")
|
||||||
&& tag.getInt("ammo") < 5
|
&& tag.getInt("ammo") < 5
|
||||||
&& (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).sniperAmmo > 0) {
|
&& (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).sniperAmmo > 0) {
|
||||||
if (tag.getInt("ammo") > 0) {
|
if (tag.getInt("ammo") > 0) {
|
||||||
tag.putDouble("reloading", 1);
|
tag.putBoolean("reloading", true);
|
||||||
tag.putDouble("emptyreload", 0);
|
tag.putBoolean("empty_reload", false);
|
||||||
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
||||||
tag.putDouble("reloadtime", 65);
|
tag.putDouble("reloading_time", 65);
|
||||||
} else if (tag.getInt("ammo") == 0) {
|
} else if (tag.getInt("ammo") == 0) {
|
||||||
tag.putDouble("reloading", 1);
|
tag.putBoolean("reloading", true);
|
||||||
tag.putDouble("emptyreload", 1);
|
tag.putDouble("empty_reload", 1);
|
||||||
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
||||||
tag.putDouble("reloadtime", 83);
|
tag.putDouble("reloading_time", 83);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (player.getMainHandItem().getItem() == TargetModItems.VECTOR.get()
|
if (player.getMainHandItem().getItem() == TargetModItems.VECTOR.get()
|
||||||
&& !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem()))
|
&& !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem()))
|
||||||
&& tag.getDouble("reloading") == 0
|
&& !tag.getBoolean("reloading")
|
||||||
&& tag.getInt("ammo") < 34
|
&& tag.getInt("ammo") < 34
|
||||||
&& (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).handgunAmmo > 0) {
|
&& (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).handgunAmmo > 0) {
|
||||||
if (tag.getInt("ammo") > 0) {
|
if (tag.getInt("ammo") > 0) {
|
||||||
tag.putDouble("reloading", 1);
|
tag.putBoolean("reloading", true);
|
||||||
tag.putDouble("emptyreload", 0);
|
tag.putBoolean("empty_reload", false);
|
||||||
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
||||||
tag.putDouble("reloadtime", 47);
|
tag.putDouble("reloading_time", 47);
|
||||||
} else if (tag.getInt("ammo") == 0) {
|
} else if (tag.getInt("ammo") == 0) {
|
||||||
tag.putDouble("reloading", 1);
|
tag.putBoolean("reloading", true);
|
||||||
tag.putDouble("emptyreload", 1);
|
tag.putDouble("empty_reload", 1);
|
||||||
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
||||||
tag.putDouble("reloadtime", 61);
|
tag.putDouble("reloading_time", 61);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (player.getMainHandItem().getItem() == TargetModItems.MK_14.get()
|
if (player.getMainHandItem().getItem() == TargetModItems.MK_14.get()
|
||||||
&& !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem()))
|
&& !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem()))
|
||||||
&& tag.getDouble("reloading") == 0
|
&& !tag.getBoolean("reloading")
|
||||||
&& tag.getInt("ammo") < 21
|
&& tag.getInt("ammo") < 21
|
||||||
&& (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleAmmo > 0) {
|
&& (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleAmmo > 0) {
|
||||||
if (tag.getInt("ammo") > 0) {
|
if (tag.getInt("ammo") > 0) {
|
||||||
tag.putDouble("reloading", 1);
|
tag.putBoolean("reloading", true);
|
||||||
tag.putDouble("emptyreload", 0);
|
tag.putBoolean("empty_reload", false);
|
||||||
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
||||||
tag.putDouble("reloadtime", 45);
|
tag.putDouble("reloading_time", 45);
|
||||||
} else if (tag.getInt("ammo") == 0) {
|
} else if (tag.getInt("ammo") == 0) {
|
||||||
tag.putDouble("reloading", 1);
|
tag.putBoolean("reloading", true);
|
||||||
tag.putDouble("emptyreload", 1);
|
tag.putDouble("empty_reload", 1);
|
||||||
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
||||||
tag.putDouble("reloadtime", 55);
|
tag.putDouble("reloading_time", 55);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (player.getMainHandItem().getItem() == TargetModItems.SKS.get()
|
if (player.getMainHandItem().getItem() == TargetModItems.SKS.get()
|
||||||
&& !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem()))
|
&& !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem()))
|
||||||
&& tag.getDouble("reloading") == 0
|
&& !tag.getBoolean("reloading")
|
||||||
&& tag.getInt("ammo") < 21
|
&& tag.getInt("ammo") < 21
|
||||||
&& (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleAmmo > 0) {
|
&& (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleAmmo > 0) {
|
||||||
if (tag.getInt("ammo") > 0) {
|
if (tag.getInt("ammo") > 0) {
|
||||||
tag.putDouble("reloading", 1);
|
tag.putBoolean("reloading", true);
|
||||||
tag.putDouble("emptyreload", 0);
|
tag.putBoolean("empty_reload", false);
|
||||||
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
||||||
tag.putDouble("reloadtime", 41);
|
tag.putDouble("reloading_time", 41);
|
||||||
} else if (tag.getInt("ammo") == 0) {
|
} else if (tag.getInt("ammo") == 0) {
|
||||||
tag.putDouble("reloading", 1);
|
tag.putBoolean("reloading", true);
|
||||||
tag.putDouble("emptyreload", 1);
|
tag.putDouble("empty_reload", 1);
|
||||||
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
||||||
tag.putDouble("reloadtime", 57);
|
tag.putDouble("reloading_time", 57);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (player.getMainHandItem().getItem() == TargetModItems.AK_47.get()
|
if (player.getMainHandItem().getItem() == TargetModItems.AK_47.get()
|
||||||
&& !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem()))
|
&& !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem()))
|
||||||
&& tag.getDouble("reloading") == 0
|
&& !tag.getBoolean("reloading")
|
||||||
&& tag.getInt("ammo") < 31
|
&& tag.getInt("ammo") < 31
|
||||||
&& (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleAmmo > 0) {
|
&& (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleAmmo > 0) {
|
||||||
if (tag.getInt("ammo") > 0) {
|
if (tag.getInt("ammo") > 0) {
|
||||||
tag.putDouble("reloading", 1);
|
tag.putBoolean("reloading", true);
|
||||||
tag.putDouble("emptyreload", 0);
|
tag.putBoolean("empty_reload", false);
|
||||||
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
||||||
tag.putDouble("reloadtime", 41);
|
tag.putDouble("reloading_time", 41);
|
||||||
} else if (tag.getInt("ammo") == 0) {
|
} else if (tag.getInt("ammo") == 0) {
|
||||||
tag.putDouble("reloading", 1);
|
tag.putBoolean("reloading", true);
|
||||||
tag.putDouble("emptyreload", 1);
|
tag.putDouble("empty_reload", 1);
|
||||||
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
||||||
tag.putDouble("reloadtime", 57);
|
tag.putDouble("reloading_time", 57);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ((player.getMainHandItem().getItem() == TargetModItems.M_4.get()
|
if ((player.getMainHandItem().getItem() == TargetModItems.M_4.get()
|
||||||
|| player.getMainHandItem().getItem() == TargetModItems.HK_416.get())
|
|| player.getMainHandItem().getItem() == TargetModItems.HK_416.get())
|
||||||
&& !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem()))
|
&& !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem()))
|
||||||
&& tag.getDouble("reloading") == 0
|
&& !tag.getBoolean("reloading")
|
||||||
&& tag.getInt("ammo") < 31
|
&& tag.getInt("ammo") < 31
|
||||||
&& (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleAmmo > 0) {
|
&& (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleAmmo > 0) {
|
||||||
if (tag.getInt("ammo") > 0) {
|
if (tag.getInt("ammo") > 0) {
|
||||||
tag.putDouble("reloading", 1);
|
tag.putBoolean("reloading", true);
|
||||||
tag.putDouble("emptyreload", 0);
|
tag.putBoolean("empty_reload", false);
|
||||||
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
||||||
tag.putDouble("reloadtime", 41);
|
tag.putDouble("reloading_time", 41);
|
||||||
} else if (tag.getInt("ammo") == 0) {
|
} else if (tag.getInt("ammo") == 0) {
|
||||||
tag.putDouble("reloading", 1);
|
tag.putBoolean("reloading", true);
|
||||||
tag.putDouble("emptyreload", 1);
|
tag.putDouble("empty_reload", 1);
|
||||||
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
||||||
tag.putDouble("reloadtime", 55);
|
tag.putDouble("reloading_time", 55);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (player.getMainHandItem().getItem() == TargetModItems.AA_12.get()
|
if (player.getMainHandItem().getItem() == TargetModItems.AA_12.get()
|
||||||
&& !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem()))
|
&& !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem()))
|
||||||
&& tag.getDouble("reloading") == 0
|
&& !tag.getBoolean("reloading")
|
||||||
&& tag.getInt("ammo") < 26
|
&& tag.getInt("ammo") < 26
|
||||||
&& (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).shotgunAmmo > 0) {
|
&& (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).shotgunAmmo > 0) {
|
||||||
if (tag.getInt("ammo") > 0) {
|
if (tag.getInt("ammo") > 0) {
|
||||||
tag.putDouble("reloading", 1);
|
tag.putBoolean("reloading", true);
|
||||||
tag.putDouble("emptyreload", 0);
|
tag.putBoolean("empty_reload", false);
|
||||||
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
||||||
tag.putDouble("reloadtime", 44);
|
tag.putDouble("reloading_time", 44);
|
||||||
} else if (tag.getInt("ammo") == 0) {
|
} else if (tag.getInt("ammo") == 0) {
|
||||||
tag.putDouble("reloading", 1);
|
tag.putBoolean("reloading", true);
|
||||||
tag.putDouble("emptyreload", 1);
|
tag.putDouble("empty_reload", 1);
|
||||||
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
||||||
tag.putDouble("reloadtime", 55);
|
tag.putDouble("reloading_time", 55);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (player.getMainHandItem().getItem() == TargetModItems.DEVOTION.get()
|
if (player.getMainHandItem().getItem() == TargetModItems.DEVOTION.get()
|
||||||
&& !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem()))
|
&& !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem()))
|
||||||
&& tag.getDouble("reloading") == 0
|
&& !tag.getBoolean("reloading")
|
||||||
&& (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleAmmo > 0
|
&& (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleAmmo > 0
|
||||||
&& tag.getInt("ammo") < 56) {
|
&& tag.getInt("ammo") < 56) {
|
||||||
if (tag.getInt("ammo") > 0) {
|
if (tag.getInt("ammo") > 0) {
|
||||||
tag.putDouble("reloading", 1);
|
tag.putBoolean("reloading", true);
|
||||||
tag.putDouble("emptyreload", 0);
|
tag.putBoolean("empty_reload", false);
|
||||||
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
||||||
tag.putDouble("reloadtime", 51);
|
tag.putDouble("reloading_time", 51);
|
||||||
} else if (tag.getInt("ammo") == 0) {
|
} else if (tag.getInt("ammo") == 0) {
|
||||||
tag.putDouble("reloading", 1);
|
tag.putBoolean("reloading", true);
|
||||||
tag.putDouble("emptyreload", 1);
|
tag.putDouble("empty_reload", 1);
|
||||||
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
||||||
tag.putDouble("reloadtime", 71);
|
tag.putDouble("reloading_time", 71);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (player.getMainHandItem().getItem() == TargetModItems.RPK.get()
|
if (player.getMainHandItem().getItem() == TargetModItems.RPK.get()
|
||||||
&& !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem()))
|
&& !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem()))
|
||||||
&& tag.getDouble("reloading") == 0
|
&& !tag.getBoolean("reloading")
|
||||||
&& (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleAmmo > 0
|
&& (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleAmmo > 0
|
||||||
&& tag.getInt("ammo") < 76) {
|
&& tag.getInt("ammo") < 76) {
|
||||||
if (tag.getInt("ammo") > 0) {
|
if (tag.getInt("ammo") > 0) {
|
||||||
tag.putDouble("reloading", 1);
|
tag.putBoolean("reloading", true);
|
||||||
tag.putDouble("emptyreload", 0);
|
tag.putBoolean("empty_reload", false);
|
||||||
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
||||||
tag.putDouble("reloadtime", 66);
|
tag.putDouble("reloading_time", 66);
|
||||||
} else if (tag.getInt("ammo") == 0) {
|
} else if (tag.getInt("ammo") == 0) {
|
||||||
tag.putDouble("reloading", 1);
|
tag.putBoolean("reloading", true);
|
||||||
tag.putDouble("emptyreload", 1);
|
tag.putDouble("empty_reload", 1);
|
||||||
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
||||||
tag.putDouble("reloadtime", 83);
|
tag.putDouble("reloading_time", 83);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (player.getMainHandItem().getItem() == TargetModItems.SENTINEL.get()
|
if (player.getMainHandItem().getItem() == TargetModItems.SENTINEL.get()
|
||||||
&& !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem()))
|
&& !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem()))
|
||||||
&& tag.getDouble("reloading") == 0
|
&& !tag.getBoolean("reloading")
|
||||||
&& tag.getInt("ammo") < 6
|
&& tag.getInt("ammo") < 6
|
||||||
&& (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).sniperAmmo > 0) {
|
&& (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).sniperAmmo > 0) {
|
||||||
if (tag.getInt("ammo") > 0) {
|
if (tag.getInt("ammo") > 0) {
|
||||||
tag.putDouble("reloading", 1);
|
tag.putBoolean("reloading", true);
|
||||||
tag.putDouble("emptyreload", 0);
|
tag.putBoolean("empty_reload", false);
|
||||||
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
||||||
tag.putDouble("reloadtime", 53);
|
tag.putDouble("reloading_time", 53);
|
||||||
} else if (tag.getInt("ammo") == 0) {
|
} else if (tag.getInt("ammo") == 0) {
|
||||||
tag.putDouble("reloading", 1);
|
tag.putBoolean("reloading", true);
|
||||||
tag.putDouble("emptyreload", 1);
|
tag.putDouble("empty_reload", 1);
|
||||||
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
||||||
tag.putDouble("reloadtime", 73);
|
tag.putDouble("reloading_time", 73);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (player.getMainHandItem().getItem() == TargetModItems.SVD.get()
|
if (player.getMainHandItem().getItem() == TargetModItems.SVD.get()
|
||||||
&& !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem()))
|
&& !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem()))
|
||||||
&& tag.getDouble("reloading") == 0
|
&& !tag.getBoolean("reloading")
|
||||||
&& tag.getInt("ammo") < 11
|
&& tag.getInt("ammo") < 11
|
||||||
&& (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).sniperAmmo > 0) {
|
&& (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).sniperAmmo > 0) {
|
||||||
if (tag.getInt("ammo") > 0) {
|
if (tag.getInt("ammo") > 0) {
|
||||||
tag.putDouble("reloading", 1);
|
tag.putBoolean("reloading", true);
|
||||||
tag.putDouble("emptyreload", 0);
|
tag.putBoolean("empty_reload", false);
|
||||||
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
||||||
tag.putDouble("reloadtime", 55);
|
tag.putDouble("reloading_time", 55);
|
||||||
} else if (tag.getInt("ammo") == 0) {
|
} else if (tag.getInt("ammo") == 0) {
|
||||||
tag.putDouble("reloading", 1);
|
tag.putBoolean("reloading", true);
|
||||||
tag.putDouble("emptyreload", 1);
|
tag.putDouble("empty_reload", 1);
|
||||||
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
||||||
tag.putDouble("reloadtime", 66);
|
tag.putDouble("reloading_time", 66);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (player.getMainHandItem().getItem() == TargetModItems.M_60.get()
|
if (player.getMainHandItem().getItem() == TargetModItems.M_60.get()
|
||||||
&& !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem()))
|
&& !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem()))
|
||||||
&& tag.getDouble("reloading") == 0
|
&& !tag.getBoolean("reloading")
|
||||||
&& (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleAmmo > 0
|
&& (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleAmmo > 0
|
||||||
&& tag.getInt("ammo") < 100) {
|
&& tag.getInt("ammo") < 100) {
|
||||||
if (tag.getInt("ammo") > 0) {
|
if (tag.getInt("ammo") > 0) {
|
||||||
tag.putDouble("reloading", 1);
|
tag.putBoolean("reloading", true);
|
||||||
tag.putDouble("emptyreload", 0);
|
tag.putBoolean("empty_reload", false);
|
||||||
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
||||||
tag.putDouble("reloadtime", 111);
|
tag.putDouble("reloading_time", 111);
|
||||||
} else if (tag.getInt("ammo") == 0) {
|
} else if (tag.getInt("ammo") == 0) {
|
||||||
tag.putDouble("reloading", 1);
|
tag.putBoolean("reloading", true);
|
||||||
tag.putDouble("emptyreload", 1);
|
tag.putDouble("empty_reload", 1);
|
||||||
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
||||||
tag.putDouble("reloadtime", 129);
|
tag.putDouble("reloading_time", 129);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (player.getMainHandItem().getItem() == TargetModItems.MARLIN.get()
|
if (player.getMainHandItem().getItem() == TargetModItems.MARLIN.get()
|
||||||
&& !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem()))
|
&& !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem()))
|
||||||
&& tag.getDouble("reloading") == 0
|
&& !tag.getBoolean("reloading")
|
||||||
&& tag.getInt("ammo") < 8
|
&& tag.getInt("ammo") < 8
|
||||||
&& (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleAmmo > 0) {
|
&& (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleAmmo > 0) {
|
||||||
tag.putDouble("reloading", 1);
|
tag.putBoolean("reloading", true);
|
||||||
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
||||||
player.getCooldowns().addCooldown(player.getMainHandItem().getItem(), 5);
|
player.getCooldowns().addCooldown(player.getMainHandItem().getItem(), 5);
|
||||||
tag.putDouble("prepare", 5);
|
tag.putDouble("prepare", 5);
|
||||||
|
@ -322,12 +322,12 @@ public class PlayerReloadProcedure {
|
||||||
}
|
}
|
||||||
if (player.getMainHandItem().getItem() == TargetModItems.M_870.get()
|
if (player.getMainHandItem().getItem() == TargetModItems.M_870.get()
|
||||||
&& !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem()))
|
&& !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem()))
|
||||||
&& tag.getDouble("reloading") == 0
|
&& !tag.getBoolean("reloading")
|
||||||
&& tag.getInt("ammo") < 8
|
&& tag.getInt("ammo") < 8
|
||||||
&& (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).shotgunAmmo > 0) {
|
&& (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).shotgunAmmo > 0) {
|
||||||
if (tag.getInt("ammo") == 0) {
|
if (tag.getInt("ammo") == 0) {
|
||||||
tag.putDouble("emptyreload", 1);
|
tag.putDouble("empty_reload", 1);
|
||||||
tag.putDouble("reloading", 1);
|
tag.putBoolean("reloading", true);
|
||||||
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
||||||
player.getCooldowns().addCooldown(player.getMainHandItem().getItem(), 36);
|
player.getCooldowns().addCooldown(player.getMainHandItem().getItem(), 36);
|
||||||
tag.putDouble("prepare", 36);
|
tag.putDouble("prepare", 36);
|
||||||
|
@ -337,7 +337,7 @@ public class PlayerReloadProcedure {
|
||||||
entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:m_870_preparealt player @s ~ ~ ~ 100 1");
|
entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:m_870_preparealt player @s ~ ~ ~ 100 1");
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
tag.putDouble("reloading", 1);
|
tag.putBoolean("reloading", true);
|
||||||
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810)));
|
||||||
if (entity instanceof Player _player)
|
if (entity instanceof Player _player)
|
||||||
_player.getCooldowns().addCooldown(player.getMainHandItem().getItem(), 7);
|
_player.getCooldowns().addCooldown(player.getMainHandItem().getItem(), 7);
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
package net.mcreator.target.procedures;
|
package net.mcreator.target.procedures;
|
||||||
|
|
||||||
|
import net.mcreator.target.event.GunEventHandler;
|
||||||
import net.mcreator.target.init.TargetModItems;
|
import net.mcreator.target.init.TargetModItems;
|
||||||
import net.mcreator.target.init.TargetModTags;
|
import net.mcreator.target.init.TargetModTags;
|
||||||
import net.mcreator.target.network.TargetModVariables;
|
import net.mcreator.target.network.TargetModVariables;
|
||||||
|
@ -7,7 +8,6 @@ import net.minecraft.commands.CommandSource;
|
||||||
import net.minecraft.commands.CommandSourceStack;
|
import net.minecraft.commands.CommandSourceStack;
|
||||||
import net.minecraft.server.level.ServerLevel;
|
import net.minecraft.server.level.ServerLevel;
|
||||||
import net.minecraft.world.entity.player.Player;
|
import net.minecraft.world.entity.player.Player;
|
||||||
import net.mcreator.target.event.GunEventHandler;
|
|
||||||
|
|
||||||
public class PressFireProcedure {
|
public class PressFireProcedure {
|
||||||
public static void execute(Player player) {
|
public static void execute(Player player) {
|
||||||
|
@ -18,7 +18,7 @@ public class PressFireProcedure {
|
||||||
MarlinfireProcedure.execute(player);
|
MarlinfireProcedure.execute(player);
|
||||||
M870fireProcedure.execute(player);
|
M870fireProcedure.execute(player);
|
||||||
VectorFireProcedure.execute(player);
|
VectorFireProcedure.execute(player);
|
||||||
player.getPersistentData().putDouble("firing", 1);
|
player.getPersistentData().putBoolean("firing", true);
|
||||||
|
|
||||||
var mainHandItem = player.getMainHandItem();
|
var mainHandItem = player.getMainHandItem();
|
||||||
var tag = mainHandItem.getOrCreateTag();
|
var tag = mainHandItem.getOrCreateTag();
|
||||||
|
@ -27,7 +27,7 @@ public class PressFireProcedure {
|
||||||
&& !(mainHandItem.getItem() == TargetModItems.BOCEK.get())
|
&& !(mainHandItem.getItem() == TargetModItems.BOCEK.get())
|
||||||
&& !(mainHandItem.getItem() == TargetModItems.MINIGUN.get())
|
&& !(mainHandItem.getItem() == TargetModItems.MINIGUN.get())
|
||||||
&& tag.getInt("ammo") == 0
|
&& tag.getInt("ammo") == 0
|
||||||
&& tag.getDouble("reloading") != 1) {
|
&& !tag.getBoolean("reloading")) {
|
||||||
if (!player.level().isClientSide() && player.getServer() != null) {
|
if (!player.level().isClientSide() && player.getServer() != null) {
|
||||||
player.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, player.position(), player.getRotationVector(), (ServerLevel) player.level(), 4,
|
player.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, player.position(), player.getRotationVector(), (ServerLevel) player.level(), 4,
|
||||||
player.getName().getString(), player.getDisplayName(), player.level().getServer(), player), "playsound target:triggerclick player @s ~ ~ ~ 10 1");
|
player.getName().getString(), player.getDisplayName(), player.level().getServer(), player), "playsound target:triggerclick player @s ~ ~ ~ 10 1");
|
||||||
|
|
|
@ -25,7 +25,7 @@ public class RpgFireProcedure {
|
||||||
ItemStack mainHandItem = player.getMainHandItem();
|
ItemStack mainHandItem = player.getMainHandItem();
|
||||||
CompoundTag tag = mainHandItem.getOrCreateTag();
|
CompoundTag tag = mainHandItem.getOrCreateTag();
|
||||||
|
|
||||||
if (mainHandItem.getItem() == TargetModItems.RPG.get() && tag.getDouble("reloading") == 0 && !player.getCooldowns().isOnCooldown(mainHandItem.getItem())
|
if (mainHandItem.getItem() == TargetModItems.RPG.get() && !tag.getBoolean("reloading") && !player.getCooldowns().isOnCooldown(mainHandItem.getItem())
|
||||||
&& tag.getInt("ammo") > 0) {
|
&& tag.getInt("ammo") > 0) {
|
||||||
player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
|
player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
|
||||||
capability.recoilHorizon = Math.random() < 0.5 ? -1 : 1;
|
capability.recoilHorizon = Math.random() < 0.5 ? -1 : 1;
|
||||||
|
@ -60,7 +60,7 @@ public class RpgFireProcedure {
|
||||||
player.level().playSound(null, player.blockPosition(), TargetModSounds.RPG_FAR.get(), SoundSource.PLAYERS, 8, 1);
|
player.level().playSound(null, player.blockPosition(), TargetModSounds.RPG_FAR.get(), SoundSource.PLAYERS, 8, 1);
|
||||||
player.level().playSound(null, player.blockPosition(), TargetModSounds.RPG_VERYFAR.get(), SoundSource.PLAYERS, 16, 1);
|
player.level().playSound(null, player.blockPosition(), TargetModSounds.RPG_VERYFAR.get(), SoundSource.PLAYERS, 16, 1);
|
||||||
}
|
}
|
||||||
tag.putDouble("fireanim", 2);
|
tag.putInt("fire_animation", 2);
|
||||||
tag.putInt("ammo", tag.getInt("ammo") - 1);
|
tag.putInt("ammo", tag.getInt("ammo") - 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -75,7 +75,7 @@ public class RpgFireProcedure {
|
||||||
entityToSpawn.setSilent(true);
|
entityToSpawn.setSilent(true);
|
||||||
return entityToSpawn;
|
return entityToSpawn;
|
||||||
}
|
}
|
||||||
}.getArrow(projectileLevel, player, (float) ((tag.getDouble("damage") / tag.getDouble("velocity")) * (1 + 0.05 * tag.getDouble("level"))), 0);
|
}.getArrow(projectileLevel, player, (float) ((tag.getDouble("damage") / tag.getDouble("velocity")) * (1 + 0.05 * tag.getInt("level"))), 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,12 +16,12 @@ public class RpgWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
|
||||||
CompoundTag tag = itemstack.getOrCreateTag();
|
CompoundTag tag = itemstack.getOrCreateTag();
|
||||||
double id = tag.getDouble("id");
|
double id = tag.getDouble("id");
|
||||||
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") != tag.getDouble("id")) {
|
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") != tag.getDouble("id")) {
|
||||||
tag.putDouble("emptyreload", 0);
|
tag.putBoolean("empty_reload", false);
|
||||||
tag.putDouble("reloading", 0);
|
tag.putBoolean("reloading", false);
|
||||||
tag.putDouble("reloadtime", 0);
|
tag.putDouble("reloading_time", 0);
|
||||||
}
|
}
|
||||||
if (tag.getDouble("reloading") == 1) {
|
if (tag.getBoolean("reloading")) {
|
||||||
if (tag.getDouble("reloadtime") == 91) {
|
if (tag.getDouble("reloading_time") == 91) {
|
||||||
entity.getPersistentData().putDouble("id", id);
|
entity.getPersistentData().putDouble("id", id);
|
||||||
if (entity.getServer() != null) {
|
if (entity.getServer() != null) {
|
||||||
entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4,
|
entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4,
|
||||||
|
@ -30,25 +30,25 @@ public class RpgWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
|
||||||
}
|
}
|
||||||
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
||||||
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
if (tag.getDouble("reloadtime") > 0) {
|
if (tag.getDouble("reloading_time") > 0) {
|
||||||
tag.putDouble("reloadtime", (tag.getDouble("reloadtime") - 1));
|
tag.putDouble("reloading_time", (tag.getDouble("reloading_time") - 1));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
tag.putDouble("reloading", 0);
|
tag.putBoolean("reloading", false);
|
||||||
tag.putDouble("reloadtime", 0);
|
tag.putDouble("reloading_time", 0);
|
||||||
tag.putDouble("emptyreload", 0);
|
tag.putBoolean("empty_reload", false);
|
||||||
}
|
}
|
||||||
if (tag.getDouble("reloadtime") == 84) {
|
if (tag.getDouble("reloading_time") == 84) {
|
||||||
tag.putDouble("empty", 0);
|
tag.putDouble("empty", 0);
|
||||||
}
|
}
|
||||||
if (tag.getDouble("reloadtime") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
if (tag.getDouble("reloading_time") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
if (tag.getInt("maxammo") >= 0) {
|
if (tag.getInt("maxammo") >= 0) {
|
||||||
tag.putInt("ammo", 1);
|
tag.putInt("ammo", 1);
|
||||||
if (entity instanceof Player _player) {
|
if (entity instanceof Player _player) {
|
||||||
_player.getInventory().clearOrCountMatchingItems(p -> TargetModItems.ROCKET.get() == p.getItem(), 1, _player.inventoryMenu.getCraftSlots());
|
_player.getInventory().clearOrCountMatchingItems(p -> TargetModItems.ROCKET.get() == p.getItem(), 1, _player.inventoryMenu.getCraftSlots());
|
||||||
}
|
}
|
||||||
tag.putDouble("reloading", 0);
|
tag.putBoolean("reloading", false);
|
||||||
tag.putDouble("emptyreload", 0);
|
tag.putBoolean("empty_reload", false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,12 +14,12 @@ public class RpkWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
|
||||||
if (entity == null) return;
|
if (entity == null) return;
|
||||||
double id = itemstack.getOrCreateTag().getDouble("id");
|
double id = itemstack.getOrCreateTag().getDouble("id");
|
||||||
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") != itemstack.getOrCreateTag().getDouble("id")) {
|
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") != itemstack.getOrCreateTag().getDouble("id")) {
|
||||||
itemstack.getOrCreateTag().putDouble("emptyreload", 0);
|
itemstack.getOrCreateTag().putBoolean("empty_reload", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloading", 0);
|
itemstack.getOrCreateTag().putBoolean("reloading", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", 0);
|
itemstack.getOrCreateTag().putDouble("reloading_time", 0);
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloading") == 1 && itemstack.getOrCreateTag().getInt("ammo") == 0) {
|
if (itemstack.getOrCreateTag().getBoolean("reloading") && itemstack.getOrCreateTag().getInt("ammo") == 0) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 83) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 83) {
|
||||||
entity.getPersistentData().putDouble("id", id);
|
entity.getPersistentData().putDouble("id", id);
|
||||||
if (!entity.level().isClientSide() && entity.getServer() != null) {
|
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,
|
entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4,
|
||||||
|
@ -28,19 +28,19 @@ public class RpkWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
|
||||||
}
|
}
|
||||||
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
||||||
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") > 0) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") > 0) {
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", (itemstack.getOrCreateTag().getDouble("reloadtime") - 1));
|
itemstack.getOrCreateTag().putDouble("reloading_time", (itemstack.getOrCreateTag().getDouble("reloading_time") - 1));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
itemstack.getOrCreateTag().putDouble("reloading", 0);
|
itemstack.getOrCreateTag().putBoolean("reloading", false);
|
||||||
itemstack.getOrCreateTag().putDouble("emptyreload", 0);
|
itemstack.getOrCreateTag().putBoolean("empty_reload", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", 0);
|
itemstack.getOrCreateTag().putDouble("reloading_time", 0);
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
GunReload.reload(entity, GunInfo.Type.RIFLE);
|
GunReload.reload(entity, GunInfo.Type.RIFLE);
|
||||||
}
|
}
|
||||||
} else if (itemstack.getOrCreateTag().getDouble("reloading") == 1 && itemstack.getOrCreateTag().getInt("ammo") > 0) {
|
} else if (itemstack.getOrCreateTag().getBoolean("reloading") && itemstack.getOrCreateTag().getInt("ammo") > 0) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 66) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 66) {
|
||||||
entity.getPersistentData().putDouble("id", id);
|
entity.getPersistentData().putDouble("id", id);
|
||||||
if (!entity.level().isClientSide() && entity.getServer() != null) {
|
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,
|
entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4,
|
||||||
|
@ -49,15 +49,15 @@ public class RpkWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
|
||||||
}
|
}
|
||||||
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
||||||
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") > 0) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") > 0) {
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", (itemstack.getOrCreateTag().getDouble("reloadtime") - 1));
|
itemstack.getOrCreateTag().putDouble("reloading_time", (itemstack.getOrCreateTag().getDouble("reloading_time") - 1));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
itemstack.getOrCreateTag().putDouble("reloading", 0);
|
itemstack.getOrCreateTag().putBoolean("reloading", false);
|
||||||
itemstack.getOrCreateTag().putDouble("emptyreload", 0);
|
itemstack.getOrCreateTag().putBoolean("empty_reload", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", 0);
|
itemstack.getOrCreateTag().putDouble("reloading_time", 0);
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
GunReload.reload(entity, GunInfo.Type.RIFLE, true);
|
GunReload.reload(entity, GunInfo.Type.RIFLE, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,12 +17,12 @@ public class SentinelWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
|
||||||
double cid = 0;
|
double cid = 0;
|
||||||
id = itemstack.getOrCreateTag().getDouble("id");
|
id = itemstack.getOrCreateTag().getDouble("id");
|
||||||
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") != itemstack.getOrCreateTag().getDouble("id")) {
|
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") != itemstack.getOrCreateTag().getDouble("id")) {
|
||||||
itemstack.getOrCreateTag().putDouble("emptyreload", 0);
|
itemstack.getOrCreateTag().putBoolean("empty_reload", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloading", 0);
|
itemstack.getOrCreateTag().putBoolean("reloading", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", 0);
|
itemstack.getOrCreateTag().putDouble("reloading_time", 0);
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloading") == 1 && itemstack.getOrCreateTag().getInt("ammo") == 0) {
|
if (itemstack.getOrCreateTag().getBoolean("reloading") && itemstack.getOrCreateTag().getInt("ammo") == 0) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 73) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 73) {
|
||||||
entity.getPersistentData().putDouble("id", id);
|
entity.getPersistentData().putDouble("id", id);
|
||||||
{
|
{
|
||||||
Entity _ent = entity;
|
Entity _ent = entity;
|
||||||
|
@ -34,19 +34,19 @@ public class SentinelWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
|
||||||
}
|
}
|
||||||
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
||||||
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") > 0) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") > 0) {
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", (itemstack.getOrCreateTag().getDouble("reloadtime") - 1));
|
itemstack.getOrCreateTag().putDouble("reloading_time", (itemstack.getOrCreateTag().getDouble("reloading_time") - 1));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
itemstack.getOrCreateTag().putDouble("reloading", 0);
|
itemstack.getOrCreateTag().putBoolean("reloading", false);
|
||||||
itemstack.getOrCreateTag().putDouble("emptyreload", 0);
|
itemstack.getOrCreateTag().putBoolean("empty_reload", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", 0);
|
itemstack.getOrCreateTag().putDouble("reloading_time", 0);
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
GunReload.reload(entity, GunInfo.Type.SNIPER);
|
GunReload.reload(entity, GunInfo.Type.SNIPER);
|
||||||
}
|
}
|
||||||
} else if (itemstack.getOrCreateTag().getDouble("reloading") == 1 && itemstack.getOrCreateTag().getInt("ammo") > 0) {
|
} else if (itemstack.getOrCreateTag().getBoolean("reloading") && itemstack.getOrCreateTag().getInt("ammo") > 0) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 53) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 53) {
|
||||||
entity.getPersistentData().putDouble("id", id);
|
entity.getPersistentData().putDouble("id", id);
|
||||||
{
|
{
|
||||||
Entity _ent = entity;
|
Entity _ent = entity;
|
||||||
|
@ -58,23 +58,23 @@ public class SentinelWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
|
||||||
}
|
}
|
||||||
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
||||||
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") > 0) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") > 0) {
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", (itemstack.getOrCreateTag().getDouble("reloadtime") - 1));
|
itemstack.getOrCreateTag().putDouble("reloading_time", (itemstack.getOrCreateTag().getDouble("reloading_time") - 1));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
itemstack.getOrCreateTag().putDouble("reloading", 0);
|
itemstack.getOrCreateTag().putBoolean("reloading", false);
|
||||||
itemstack.getOrCreateTag().putDouble("emptyreload", 0);
|
itemstack.getOrCreateTag().putBoolean("empty_reload", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", 0);
|
itemstack.getOrCreateTag().putDouble("reloading_time", 0);
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
GunReload.reload(entity, GunInfo.Type.SNIPER, true);
|
GunReload.reload(entity, GunInfo.Type.SNIPER, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("firing") > 0) {
|
if (itemstack.getOrCreateTag().getDouble("firing") > 0) {
|
||||||
itemstack.getOrCreateTag().putDouble("firing", (itemstack.getOrCreateTag().getDouble("firing") - 1));
|
itemstack.getOrCreateTag().putDouble("firing", (itemstack.getOrCreateTag().getDouble("firing") - 1));
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("zoomfiring") > 0) {
|
if (itemstack.getOrCreateTag().getDouble("zoom_firing") > 0) {
|
||||||
itemstack.getOrCreateTag().putDouble("zoomfiring", (itemstack.getOrCreateTag().getDouble("zoomfiring") - 1));
|
itemstack.getOrCreateTag().putDouble("zoom_firing", (itemstack.getOrCreateTag().getDouble("zoom_firing") - 1));
|
||||||
}
|
}
|
||||||
|
|
||||||
cid = itemstack.getOrCreateTag().getDouble("cid");
|
cid = itemstack.getOrCreateTag().getDouble("cid");
|
||||||
|
|
|
@ -16,12 +16,12 @@ public class SksWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
|
||||||
double id = 0;
|
double id = 0;
|
||||||
id = itemstack.getOrCreateTag().getDouble("id");
|
id = itemstack.getOrCreateTag().getDouble("id");
|
||||||
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") != itemstack.getOrCreateTag().getDouble("id")) {
|
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") != itemstack.getOrCreateTag().getDouble("id")) {
|
||||||
itemstack.getOrCreateTag().putDouble("emptyreload", 0);
|
itemstack.getOrCreateTag().putBoolean("empty_reload", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloading", 0);
|
itemstack.getOrCreateTag().putBoolean("reloading", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", 0);
|
itemstack.getOrCreateTag().putDouble("reloading_time", 0);
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloading") == 1 && itemstack.getOrCreateTag().getInt("ammo") == 0) {
|
if (itemstack.getOrCreateTag().getBoolean("reloading") && itemstack.getOrCreateTag().getInt("ammo") == 0) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 57) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 57) {
|
||||||
entity.getPersistentData().putDouble("id", id);
|
entity.getPersistentData().putDouble("id", id);
|
||||||
{
|
{
|
||||||
Entity _ent = entity;
|
Entity _ent = entity;
|
||||||
|
@ -33,22 +33,22 @@ public class SksWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
|
||||||
}
|
}
|
||||||
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
||||||
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") > 0) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") > 0) {
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", (itemstack.getOrCreateTag().getDouble("reloadtime") - 1));
|
itemstack.getOrCreateTag().putDouble("reloading_time", (itemstack.getOrCreateTag().getDouble("reloading_time") - 1));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
itemstack.getOrCreateTag().putDouble("reloading", 0);
|
itemstack.getOrCreateTag().putBoolean("reloading", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", 0);
|
itemstack.getOrCreateTag().putDouble("reloading_time", 0);
|
||||||
itemstack.getOrCreateTag().putDouble("emptyreload", 0);
|
itemstack.getOrCreateTag().putBoolean("empty_reload", false);
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 14 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 14 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
itemstack.getOrCreateTag().putDouble("gj", 0);
|
itemstack.getOrCreateTag().putDouble("gj", 0);
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
GunReload.reload(entity, GunInfo.Type.RIFLE);
|
GunReload.reload(entity, GunInfo.Type.RIFLE);
|
||||||
}
|
}
|
||||||
} else if (itemstack.getOrCreateTag().getDouble("reloading") == 1 && itemstack.getOrCreateTag().getInt("ammo") > 0) {
|
} else if (itemstack.getOrCreateTag().getBoolean("reloading") && itemstack.getOrCreateTag().getInt("ammo") > 0) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 41) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 41) {
|
||||||
entity.getPersistentData().putDouble("id", id);
|
entity.getPersistentData().putDouble("id", id);
|
||||||
{
|
{
|
||||||
Entity _ent = entity;
|
Entity _ent = entity;
|
||||||
|
@ -60,15 +60,15 @@ public class SksWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
|
||||||
}
|
}
|
||||||
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
||||||
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") > 0) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") > 0) {
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", (itemstack.getOrCreateTag().getDouble("reloadtime") - 1));
|
itemstack.getOrCreateTag().putDouble("reloading_time", (itemstack.getOrCreateTag().getDouble("reloading_time") - 1));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
itemstack.getOrCreateTag().putDouble("reloading", 0);
|
itemstack.getOrCreateTag().putBoolean("reloading", false);
|
||||||
itemstack.getOrCreateTag().putDouble("emptyreload", 0);
|
itemstack.getOrCreateTag().putBoolean("empty_reload", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", 0);
|
itemstack.getOrCreateTag().putDouble("reloading_time", 0);
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
GunReload.reload(entity, GunInfo.Type.RIFLE, true);
|
GunReload.reload(entity, GunInfo.Type.RIFLE, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,12 +16,12 @@ public class SvdWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
|
||||||
double id = 0;
|
double id = 0;
|
||||||
id = itemstack.getOrCreateTag().getDouble("id");
|
id = itemstack.getOrCreateTag().getDouble("id");
|
||||||
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") != itemstack.getOrCreateTag().getDouble("id")) {
|
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") != itemstack.getOrCreateTag().getDouble("id")) {
|
||||||
itemstack.getOrCreateTag().putDouble("emptyreload", 0);
|
itemstack.getOrCreateTag().putBoolean("empty_reload", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloading", 0);
|
itemstack.getOrCreateTag().putBoolean("reloading", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", 0);
|
itemstack.getOrCreateTag().putDouble("reloading_time", 0);
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloading") == 1 && itemstack.getOrCreateTag().getInt("ammo") == 0) {
|
if (itemstack.getOrCreateTag().getBoolean("reloading") && itemstack.getOrCreateTag().getInt("ammo") == 0) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 66) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 66) {
|
||||||
entity.getPersistentData().putDouble("id", id);
|
entity.getPersistentData().putDouble("id", id);
|
||||||
{
|
{
|
||||||
Entity _ent = entity;
|
Entity _ent = entity;
|
||||||
|
@ -33,22 +33,22 @@ public class SvdWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
|
||||||
}
|
}
|
||||||
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
||||||
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") > 0) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") > 0) {
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", (itemstack.getOrCreateTag().getDouble("reloadtime") - 1));
|
itemstack.getOrCreateTag().putDouble("reloading_time", (itemstack.getOrCreateTag().getDouble("reloading_time") - 1));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
itemstack.getOrCreateTag().putDouble("reloading", 0);
|
itemstack.getOrCreateTag().putBoolean("reloading", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", 0);
|
itemstack.getOrCreateTag().putDouble("reloading_time", 0);
|
||||||
itemstack.getOrCreateTag().putDouble("emptyreload", 0);
|
itemstack.getOrCreateTag().putBoolean("empty_reload", false);
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 14 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 14 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
itemstack.getOrCreateTag().putDouble("gj", 0);
|
itemstack.getOrCreateTag().putDouble("gj", 0);
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
GunReload.reload(entity, GunInfo.Type.SNIPER);
|
GunReload.reload(entity, GunInfo.Type.SNIPER);
|
||||||
}
|
}
|
||||||
} else if (itemstack.getOrCreateTag().getDouble("reloading") == 1 && itemstack.getOrCreateTag().getInt("ammo") > 0) {
|
} else if (itemstack.getOrCreateTag().getBoolean("reloading") && itemstack.getOrCreateTag().getInt("ammo") > 0) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 55) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 55) {
|
||||||
entity.getPersistentData().putDouble("id", id);
|
entity.getPersistentData().putDouble("id", id);
|
||||||
{
|
{
|
||||||
Entity _ent = entity;
|
Entity _ent = entity;
|
||||||
|
@ -60,15 +60,15 @@ public class SvdWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure {
|
||||||
}
|
}
|
||||||
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
||||||
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") > 0) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") > 0) {
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", (itemstack.getOrCreateTag().getDouble("reloadtime") - 1));
|
itemstack.getOrCreateTag().putDouble("reloading_time", (itemstack.getOrCreateTag().getDouble("reloading_time") - 1));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
itemstack.getOrCreateTag().putDouble("reloading", 0);
|
itemstack.getOrCreateTag().putBoolean("reloading", false);
|
||||||
itemstack.getOrCreateTag().putDouble("emptyreload", 0);
|
itemstack.getOrCreateTag().putBoolean("empty_reload", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", 0);
|
itemstack.getOrCreateTag().putDouble("reloading_time", 0);
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
GunReload.reload(entity, GunInfo.Type.SNIPER, true);
|
GunReload.reload(entity, GunInfo.Type.SNIPER, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,12 +16,12 @@ public class TasercooldownProcedure {
|
||||||
double id = 0;
|
double id = 0;
|
||||||
id = itemstack.getOrCreateTag().getDouble("id");
|
id = itemstack.getOrCreateTag().getDouble("id");
|
||||||
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") != itemstack.getOrCreateTag().getDouble("id")) {
|
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") != itemstack.getOrCreateTag().getDouble("id")) {
|
||||||
itemstack.getOrCreateTag().putDouble("emptyreload", 0);
|
itemstack.getOrCreateTag().putBoolean("empty_reload", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloading", 0);
|
itemstack.getOrCreateTag().putBoolean("reloading", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", 0);
|
itemstack.getOrCreateTag().putDouble("reloading_time", 0);
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloading") == 1) {
|
if (itemstack.getOrCreateTag().getBoolean("reloading")) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 55) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 55) {
|
||||||
entity.getPersistentData().putDouble("id", id);
|
entity.getPersistentData().putDouble("id", id);
|
||||||
{
|
{
|
||||||
Entity _ent = entity;
|
Entity _ent = entity;
|
||||||
|
@ -33,23 +33,23 @@ public class TasercooldownProcedure {
|
||||||
}
|
}
|
||||||
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem()
|
||||||
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
&& (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") > 0) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") > 0) {
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", (itemstack.getOrCreateTag().getDouble("reloadtime") - 1));
|
itemstack.getOrCreateTag().putDouble("reloading_time", (itemstack.getOrCreateTag().getDouble("reloading_time") - 1));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
itemstack.getOrCreateTag().putDouble("reloading", 0);
|
itemstack.getOrCreateTag().putBoolean("reloading", false);
|
||||||
itemstack.getOrCreateTag().putDouble("reloadtime", 0);
|
itemstack.getOrCreateTag().putDouble("reloading_time", 0);
|
||||||
itemstack.getOrCreateTag().putDouble("emptyreload", 0);
|
itemstack.getOrCreateTag().putBoolean("empty_reload", false);
|
||||||
}
|
}
|
||||||
if (itemstack.getOrCreateTag().getDouble("reloadtime") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
if (itemstack.getOrCreateTag().getDouble("reloading_time") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) {
|
||||||
if (itemstack.getOrCreateTag().getInt("maxammo") >= 1) {
|
if (itemstack.getOrCreateTag().getInt("maxammo") >= 1) {
|
||||||
itemstack.getOrCreateTag().putInt("ammo", 1);
|
itemstack.getOrCreateTag().putInt("ammo", 1);
|
||||||
if (entity instanceof Player _player) {
|
if (entity instanceof Player _player) {
|
||||||
ItemStack _stktoremove = new ItemStack(TargetModItems.TASER_ELECTRODE.get());
|
ItemStack _stktoremove = new ItemStack(TargetModItems.TASER_ELECTRODE.get());
|
||||||
_player.getInventory().clearOrCountMatchingItems(p -> _stktoremove.getItem() == p.getItem(), 1, _player.inventoryMenu.getCraftSlots());
|
_player.getInventory().clearOrCountMatchingItems(p -> _stktoremove.getItem() == p.getItem(), 1, _player.inventoryMenu.getCraftSlots());
|
||||||
}
|
}
|
||||||
itemstack.getOrCreateTag().putDouble("reloading", 0);
|
itemstack.getOrCreateTag().putBoolean("reloading", false);
|
||||||
itemstack.getOrCreateTag().putDouble("emptyreload", 0);
|
itemstack.getOrCreateTag().putBoolean("empty_reload", false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,7 +21,7 @@ public class TaserfireProcedure {
|
||||||
if (entity == null) return;
|
if (entity == null) return;
|
||||||
if (entity instanceof Player player && !player.isSpectator()) {
|
if (entity instanceof Player player && !player.isSpectator()) {
|
||||||
ItemStack usehand = player.getMainHandItem();
|
ItemStack usehand = player.getMainHandItem();
|
||||||
if (usehand.getItem() == TargetModItems.TASER.get() && usehand.getOrCreateTag().getDouble("reloading") == 0 && !(entity instanceof Player _plrCldCheck4 && _plrCldCheck4.getCooldowns().isOnCooldown(usehand.getItem()))
|
if (usehand.getItem() == TargetModItems.TASER.get() && !usehand.getOrCreateTag().getBoolean("reloading") && !(entity instanceof Player _plrCldCheck4 && _plrCldCheck4.getCooldowns().isOnCooldown(usehand.getItem()))
|
||||||
&& usehand.getOrCreateTag().getInt("ammo") > 0) {
|
&& usehand.getOrCreateTag().getInt("ammo") > 0) {
|
||||||
|
|
||||||
entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
|
entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
|
||||||
|
@ -68,7 +68,7 @@ public class TaserfireProcedure {
|
||||||
(float) ((LivingEntity) entity).getAttribute(TargetModAttributes.SPREAD.get()).getBaseValue());
|
(float) ((LivingEntity) entity).getAttribute(TargetModAttributes.SPREAD.get()).getBaseValue());
|
||||||
projectileLevel.addFreshEntity(_entityToSpawn);
|
projectileLevel.addFreshEntity(_entityToSpawn);
|
||||||
}
|
}
|
||||||
usehand.getOrCreateTag().putDouble("fireanim", 4);
|
usehand.getOrCreateTag().putInt("fire_animation", 4);
|
||||||
usehand.getOrCreateTag().putInt("ammo", (usehand.getOrCreateTag().getInt("ammo") - 1));
|
usehand.getOrCreateTag().putInt("ammo", (usehand.getOrCreateTag().getInt("ammo") - 1));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,7 +13,7 @@ public class VectorFireProcedure {
|
||||||
if (mainHandItem.getItem() != TargetModItems.VECTOR.get()) return;
|
if (mainHandItem.getItem() != TargetModItems.VECTOR.get()) return;
|
||||||
|
|
||||||
CompoundTag tag = mainHandItem.getOrCreateTag();
|
CompoundTag tag = mainHandItem.getOrCreateTag();
|
||||||
if (tag.getInt("firemode") == 1 && tag.getDouble("burst") == 0) {
|
if (tag.getInt("fire_mode") == 1 && tag.getDouble("burst") == 0) {
|
||||||
tag.putDouble("burst", 3);
|
tag.putDouble("burst", 3);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
package net.mcreator.target.tools;
|
package net.mcreator.target.tools;
|
||||||
|
|
||||||
import net.mcreator.target.init.TargetModTags;
|
|
||||||
import net.mcreator.target.network.TargetModVariables;
|
import net.mcreator.target.network.TargetModVariables;
|
||||||
import net.minecraft.nbt.CompoundTag;
|
import net.minecraft.nbt.CompoundTag;
|
||||||
import net.minecraft.world.entity.Entity;
|
import net.minecraft.world.entity.Entity;
|
||||||
|
@ -46,7 +45,7 @@ public class GunReload {
|
||||||
});
|
});
|
||||||
tag.putInt("ammo", ammo + Math.min(ammoToAdd, playerAmmo));
|
tag.putInt("ammo", ammo + Math.min(ammoToAdd, playerAmmo));
|
||||||
|
|
||||||
tag.putDouble("reloading", 0);
|
tag.putBoolean("reloading", false);
|
||||||
tag.putDouble("emptyreload", 0);
|
tag.putBoolean("empty_reload", false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -65,8 +65,8 @@ public class GunsTool {
|
||||||
|
|
||||||
public static void pvpModeCheck(ItemStack stack, Level level) {
|
public static void pvpModeCheck(ItemStack stack, Level level) {
|
||||||
if (!TargetModVariables.MapVariables.get(level).pvpMode) {
|
if (!TargetModVariables.MapVariables.get(level).pvpMode) {
|
||||||
if (stack.getOrCreateTag().getDouble("level") >= 10) {
|
if (stack.getOrCreateTag().getInt("level") >= 10) {
|
||||||
stack.getOrCreateTag().putDouble("damageadd", 1 + 0.05 * (stack.getOrCreateTag().getDouble("level") - 10));
|
stack.getOrCreateTag().putDouble("damageadd", 1 + 0.05 * (stack.getOrCreateTag().getInt("level") - 10));
|
||||||
} else {
|
} else {
|
||||||
stack.getOrCreateTag().putDouble("damageadd", 1);
|
stack.getOrCreateTag().putDouble("damageadd", 1);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue