diff --git a/src/main/java/net/mcreator/target/event/ClientEventHandler.java b/src/main/java/net/mcreator/target/event/ClientEventHandler.java index 2091528c8..25b419822 100644 --- a/src/main/java/net/mcreator/target/event/ClientEventHandler.java +++ b/src/main/java/net/mcreator/target/event/ClientEventHandler.java @@ -223,7 +223,7 @@ public class ClientEventHandler { if ((entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) { if (entity.getPersistentData().getDouble("zoom_time") < 1) { entity.getPersistentData().putDouble("zoom_time", - (entity.getPersistentData().getDouble("zoom_time") + entity.getMainHandItem().getOrCreateTag().getDouble("zoom_firing") * 0.02 * times)); + (entity.getPersistentData().getDouble("zoom_time") + entity.getMainHandItem().getOrCreateTag().getDouble("zoom_speed") * 0.02 * times)); } else { entity.getPersistentData().putDouble("zoom_time", 1); } @@ -253,8 +253,8 @@ public class ClientEventHandler { ItemStack stack = entity.getMainHandItem(); float times = 45f / fps; - amplitude = 15000 * stack.getOrCreateTag().getDouble("recoily") - * stack.getOrCreateTag().getDouble("recoilx"); + amplitude = 15000 * stack.getOrCreateTag().getDouble("recoil_y") + * stack.getOrCreateTag().getDouble("recoil_x"); var data = entity.getPersistentData(); if (entity.isShiftKeyDown() && entity.getBbHeight() >= 1 && data.getDouble("prone") == 0) { pose = 0.9; diff --git a/src/main/java/net/mcreator/target/event/GunEventHandler.java b/src/main/java/net/mcreator/target/event/GunEventHandler.java index 342b040ad..69edae96c 100644 --- a/src/main/java/net/mcreator/target/event/GunEventHandler.java +++ b/src/main/java/net/mcreator/target/event/GunEventHandler.java @@ -190,7 +190,7 @@ public class GunEventHandler { int cooldown = (int) stack.getOrCreateTag().getDouble("fire_interval") + (int) stack.getOrCreateTag().getDouble("fire_sequence") - (int) stack.getOrCreateTag().getDouble("fire_increase"); player.getCooldowns().addCooldown(stack.getItem(), cooldown); - for (int index0 = 0; index0 < (int) stack.getOrCreateTag().getDouble("projectileamount"); index0++) { + for (int index0 = 0; index0 < (int) stack.getOrCreateTag().getDouble("projectile_amount"); index0++) { gunShoot(player); } diff --git a/src/main/java/net/mcreator/target/event/PlayerEventHandler.java b/src/main/java/net/mcreator/target/event/PlayerEventHandler.java index e63dfd94f..d89b62c5c 100644 --- a/src/main/java/net/mcreator/target/event/PlayerEventHandler.java +++ b/src/main/java/net/mcreator/target/event/PlayerEventHandler.java @@ -394,8 +394,8 @@ public class PlayerEventHandler { if (!player.getMainHandItem().is(TargetModTags.Items.GUN)) return; CompoundTag tag = player.getMainHandItem().getOrCreateTag(); - float recoilX = (float) tag.getDouble("recoilx"); - float recoilY = (float) tag.getDouble("recoily"); + float recoilX = (float) tag.getDouble("recoil_x"); + float recoilY = (float) tag.getDouble("recoil_y"); var capability = player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null); float recoilYaw = capability.map(c -> c.recoilHorizon).orElse(0d).floatValue(); diff --git a/src/main/java/net/mcreator/target/item/gun/AK47Item.java b/src/main/java/net/mcreator/target/item/gun/AK47Item.java index 5f18803ac..6a166c0b3 100644 --- a/src/main/java/net/mcreator/target/item/gun/AK47Item.java +++ b/src/main/java/net/mcreator/target/item/gun/AK47Item.java @@ -82,7 +82,7 @@ public class AK47Item extends GunItem implements GeoItem, AnimatedItem { if (this.animationProcedure.equals("empty")) { - if (stack.getOrCreateTag().getDouble("drawtime") < 16) { + if (stack.getOrCreateTag().getInt("draw_time") < 16) { return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ak47.draw")); } diff --git a/src/main/java/net/mcreator/target/item/gun/Aa12Item.java b/src/main/java/net/mcreator/target/item/gun/Aa12Item.java index 9a3fc6d9d..7b2195531 100644 --- a/src/main/java/net/mcreator/target/item/gun/Aa12Item.java +++ b/src/main/java/net/mcreator/target/item/gun/Aa12Item.java @@ -82,7 +82,7 @@ public class Aa12Item extends GunItem implements GeoItem, AnimatedItem { if (this.animationProcedure.equals("empty")) { - if (stack.getOrCreateTag().getDouble("drawtime") < 16) { + if (stack.getOrCreateTag().getInt("draw_time") < 16) { return event.setAndContinue(RawAnimation.begin().thenLoop("animation.aa12.draw")); } diff --git a/src/main/java/net/mcreator/target/item/gun/Abekiri.java b/src/main/java/net/mcreator/target/item/gun/Abekiri.java index d1e6d6a16..d3e71c12f 100644 --- a/src/main/java/net/mcreator/target/item/gun/Abekiri.java +++ b/src/main/java/net/mcreator/target/item/gun/Abekiri.java @@ -83,7 +83,7 @@ public class Abekiri extends GunItem implements GeoItem, AnimatedItem { if (this.animationProcedure.equals("empty")) { - if (stack.getOrCreateTag().getDouble("drawtime") < 11) { + if (stack.getOrCreateTag().getInt("draw_time") < 11) { return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ab.draw")); } diff --git a/src/main/java/net/mcreator/target/item/gun/BocekItem.java b/src/main/java/net/mcreator/target/item/gun/BocekItem.java index 0232218e9..d4d98beb3 100644 --- a/src/main/java/net/mcreator/target/item/gun/BocekItem.java +++ b/src/main/java/net/mcreator/target/item/gun/BocekItem.java @@ -74,7 +74,7 @@ public class BocekItem extends GunItem implements GeoItem, AnimatedItem { LocalPlayer player = Minecraft.getInstance().player; ItemStack stack = player.getMainHandItem(); - if (stack.getOrCreateTag().getDouble("drawtime") < 16) { + if (stack.getOrCreateTag().getInt("draw_time") < 16) { return event.setAndContinue(RawAnimation.begin().thenLoop("animation.bocek.draw")); } diff --git a/src/main/java/net/mcreator/target/item/gun/Devotion.java b/src/main/java/net/mcreator/target/item/gun/Devotion.java index 1063036ee..79c5059be 100644 --- a/src/main/java/net/mcreator/target/item/gun/Devotion.java +++ b/src/main/java/net/mcreator/target/item/gun/Devotion.java @@ -82,7 +82,7 @@ public class Devotion extends GunItem implements GeoItem, AnimatedItem { if (this.animationProcedure.equals("empty")) { - if (stack.getOrCreateTag().getDouble("drawtime") < 16) { + if (stack.getOrCreateTag().getInt("draw_time") < 16) { return event.setAndContinue(RawAnimation.begin().thenLoop("animation.devotion.draw")); } diff --git a/src/main/java/net/mcreator/target/item/gun/GunItem.java b/src/main/java/net/mcreator/target/item/gun/GunItem.java index 0f42e07ea..445caefbc 100644 --- a/src/main/java/net/mcreator/target/item/gun/GunItem.java +++ b/src/main/java/net/mcreator/target/item/gun/GunItem.java @@ -47,7 +47,7 @@ public abstract class GunItem extends Item { if (tag.getBoolean("draw")) { tag.putBoolean("draw", false); - tag.putDouble("drawtime", 0); + tag.putInt("draw_time", 0); entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> { capability.zooming = false; capability.syncPlayerVariables(entity); @@ -77,8 +77,8 @@ public abstract class GunItem extends Item { } if (mainHandItem == itemstack.getItem()) { - if (tag.getDouble("drawtime") < 50) { - tag.putDouble("drawtime", (tag.getDouble("drawtime") + 1)); + if (tag.getInt("draw_time") < 50) { + tag.putInt("draw_time", (tag.getInt("draw_time") + 1)); } } if (tag.getInt("fire_animation") > 0) { diff --git a/src/main/java/net/mcreator/target/item/gun/Hk416Item.java b/src/main/java/net/mcreator/target/item/gun/Hk416Item.java index 821005ad3..0b443ee37 100644 --- a/src/main/java/net/mcreator/target/item/gun/Hk416Item.java +++ b/src/main/java/net/mcreator/target/item/gun/Hk416Item.java @@ -77,7 +77,7 @@ public class Hk416Item extends GunItem implements GeoItem, AnimatedItem { if (this.animationProcedure.equals("empty")) { - if (stack.getOrCreateTag().getDouble("drawtime") < 16) { + if (stack.getOrCreateTag().getInt("draw_time") < 16) { return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m4.draw")); } diff --git a/src/main/java/net/mcreator/target/item/gun/HuntingRifle.java b/src/main/java/net/mcreator/target/item/gun/HuntingRifle.java index df84239d8..42f336993 100644 --- a/src/main/java/net/mcreator/target/item/gun/HuntingRifle.java +++ b/src/main/java/net/mcreator/target/item/gun/HuntingRifle.java @@ -86,7 +86,7 @@ public class HuntingRifle extends GunItem implements GeoItem, AnimatedItem { if (this.animationProcedure.equals("empty")) { - if (stack.getOrCreateTag().getDouble("drawtime") < 16) { + if (stack.getOrCreateTag().getInt("draw_time") < 16) { return event.setAndContinue(RawAnimation.begin().thenLoop("animation.hunting_rifle.draw")); } diff --git a/src/main/java/net/mcreator/target/item/gun/Kraber.java b/src/main/java/net/mcreator/target/item/gun/Kraber.java index ddfe651b1..312d6c469 100644 --- a/src/main/java/net/mcreator/target/item/gun/Kraber.java +++ b/src/main/java/net/mcreator/target/item/gun/Kraber.java @@ -89,7 +89,7 @@ public class Kraber extends GunItem implements GeoItem, AnimatedItem { ItemStack stack = player.getMainHandItem(); if (this.animationProcedure.equals("empty")) { - if (stack.getOrCreateTag().getDouble("drawtime") < 29) { + if (stack.getOrCreateTag().getInt("draw_time") < 29) { return event.setAndContinue(RawAnimation.begin().thenLoop("animation.kraber.draw")); } diff --git a/src/main/java/net/mcreator/target/item/gun/M4Item.java b/src/main/java/net/mcreator/target/item/gun/M4Item.java index fd3dc7d19..ad648b123 100644 --- a/src/main/java/net/mcreator/target/item/gun/M4Item.java +++ b/src/main/java/net/mcreator/target/item/gun/M4Item.java @@ -77,7 +77,7 @@ public class M4Item extends GunItem implements GeoItem, AnimatedItem { if (this.animationProcedure.equals("empty")) { - if (stack.getOrCreateTag().getDouble("drawtime") < 16) { + if (stack.getOrCreateTag().getInt("draw_time") < 16) { return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m4.draw")); } diff --git a/src/main/java/net/mcreator/target/item/gun/M60Item.java b/src/main/java/net/mcreator/target/item/gun/M60Item.java index 7b8d6f4f8..f186d2acc 100644 --- a/src/main/java/net/mcreator/target/item/gun/M60Item.java +++ b/src/main/java/net/mcreator/target/item/gun/M60Item.java @@ -77,7 +77,7 @@ public class M60Item extends GunItem implements GeoItem, AnimatedItem { if (this.animationProcedure.equals("empty")) { - if (stack.getOrCreateTag().getDouble("drawtime") < 29) { + if (stack.getOrCreateTag().getInt("draw_time") < 29) { return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m60.draw")); } diff --git a/src/main/java/net/mcreator/target/item/gun/M79Item.java b/src/main/java/net/mcreator/target/item/gun/M79Item.java index 1addf88e8..0f41f8f9f 100644 --- a/src/main/java/net/mcreator/target/item/gun/M79Item.java +++ b/src/main/java/net/mcreator/target/item/gun/M79Item.java @@ -83,7 +83,7 @@ public class M79Item extends GunItem implements GeoItem, AnimatedItem { if (this.animationProcedure.equals("empty")) { - if (stack.getOrCreateTag().getDouble("drawtime") < 16) { + if (stack.getOrCreateTag().getInt("draw_time") < 16) { return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m79.draw")); } diff --git a/src/main/java/net/mcreator/target/item/gun/M870Item.java b/src/main/java/net/mcreator/target/item/gun/M870Item.java index a7f0ae3e3..e22b64613 100644 --- a/src/main/java/net/mcreator/target/item/gun/M870Item.java +++ b/src/main/java/net/mcreator/target/item/gun/M870Item.java @@ -80,7 +80,7 @@ public class M870Item extends GunItem implements GeoItem, AnimatedItem { if (transformType != null && transformType.firstPerson()) { if (this.animationProcedure.equals("empty")) { - if (stack.getOrCreateTag().getDouble("drawtime") < 16) { + if (stack.getOrCreateTag().getInt("draw_time") < 16) { return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m870.draw")); } diff --git a/src/main/java/net/mcreator/target/item/gun/M98bItem.java b/src/main/java/net/mcreator/target/item/gun/M98bItem.java index b17f00089..53b090a92 100644 --- a/src/main/java/net/mcreator/target/item/gun/M98bItem.java +++ b/src/main/java/net/mcreator/target/item/gun/M98bItem.java @@ -77,7 +77,7 @@ public class M98bItem extends GunItem implements GeoItem, AnimatedItem { if (this.animationProcedure.equals("empty")) { - if (stack.getOrCreateTag().getDouble("drawtime") < 16) { + if (stack.getOrCreateTag().getInt("draw_time") < 16) { return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m98b.draw")); } diff --git a/src/main/java/net/mcreator/target/item/gun/MarlinItem.java b/src/main/java/net/mcreator/target/item/gun/MarlinItem.java index bda4ae28b..85f339cb2 100644 --- a/src/main/java/net/mcreator/target/item/gun/MarlinItem.java +++ b/src/main/java/net/mcreator/target/item/gun/MarlinItem.java @@ -79,7 +79,7 @@ public class MarlinItem extends GunItem implements GeoItem, AnimatedItem { if (transformType != null && transformType.firstPerson()) { if (this.animationProcedure.equals("empty")) { - if (stack.getOrCreateTag().getDouble("drawtime") < 16) { + if (stack.getOrCreateTag().getInt("draw_time") < 16) { return event.setAndContinue(RawAnimation.begin().thenLoop("animation.marlin.draw")); } diff --git a/src/main/java/net/mcreator/target/item/gun/Minigun.java b/src/main/java/net/mcreator/target/item/gun/Minigun.java index 369fef9fc..e2bcec0df 100644 --- a/src/main/java/net/mcreator/target/item/gun/Minigun.java +++ b/src/main/java/net/mcreator/target/item/gun/Minigun.java @@ -112,7 +112,7 @@ public class Minigun extends GunItem implements GeoItem, AnimatedItem { if (this.animationProcedure.equals("empty")) { - if (stack.getOrCreateTag().getDouble("drawtime") < 29) { + if (stack.getOrCreateTag().getInt("draw_time") < 29) { return event.setAndContinue(RawAnimation.begin().thenLoop("animation.minigun.draw")); } diff --git a/src/main/java/net/mcreator/target/item/gun/Mk14Item.java b/src/main/java/net/mcreator/target/item/gun/Mk14Item.java index ce943dd6b..2f7fe667e 100644 --- a/src/main/java/net/mcreator/target/item/gun/Mk14Item.java +++ b/src/main/java/net/mcreator/target/item/gun/Mk14Item.java @@ -77,7 +77,7 @@ public class Mk14Item extends GunItem implements GeoItem, AnimatedItem { if (this.animationProcedure.equals("empty")) { - if (stack.getOrCreateTag().getDouble("drawtime") < 16) { + if (stack.getOrCreateTag().getInt("draw_time") < 16) { return event.setAndContinue(RawAnimation.begin().thenLoop("animation.model.draw")); } diff --git a/src/main/java/net/mcreator/target/item/gun/RpgItem.java b/src/main/java/net/mcreator/target/item/gun/RpgItem.java index b93e493a8..923604239 100644 --- a/src/main/java/net/mcreator/target/item/gun/RpgItem.java +++ b/src/main/java/net/mcreator/target/item/gun/RpgItem.java @@ -78,7 +78,7 @@ public class RpgItem extends GunItem implements GeoItem, AnimatedItem { if (this.animationProcedure.equals("empty")) { - if (stack.getOrCreateTag().getDouble("drawtime") < 16) { + if (stack.getOrCreateTag().getInt("draw_time") < 16) { return event.setAndContinue(RawAnimation.begin().thenLoop("animation.rpg.draw")); } diff --git a/src/main/java/net/mcreator/target/item/gun/RpkItem.java b/src/main/java/net/mcreator/target/item/gun/RpkItem.java index 62f53a8f2..1dba49f3d 100644 --- a/src/main/java/net/mcreator/target/item/gun/RpkItem.java +++ b/src/main/java/net/mcreator/target/item/gun/RpkItem.java @@ -77,7 +77,7 @@ public class RpkItem extends GunItem implements GeoItem, AnimatedItem { if (this.animationProcedure.equals("empty")) { - if (stack.getOrCreateTag().getDouble("drawtime") < 16) { + if (stack.getOrCreateTag().getInt("draw_time") < 16) { return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ak47.draw")); } diff --git a/src/main/java/net/mcreator/target/item/gun/SentinelItem.java b/src/main/java/net/mcreator/target/item/gun/SentinelItem.java index 841442816..1f6bb2d31 100644 --- a/src/main/java/net/mcreator/target/item/gun/SentinelItem.java +++ b/src/main/java/net/mcreator/target/item/gun/SentinelItem.java @@ -98,7 +98,7 @@ public class SentinelItem extends GunItem implements GeoItem, AnimatedItem { if (this.animationProcedure.equals("empty")) { - if (stack.getOrCreateTag().getDouble("drawtime") < 16) { + if (stack.getOrCreateTag().getInt("draw_time") < 16) { return event.setAndContinue(RawAnimation.begin().thenLoop("animation.sentinel.draw")); } @@ -122,11 +122,11 @@ public class SentinelItem extends GunItem implements GeoItem, AnimatedItem { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sentinel.reload2")); } - if (stack.getOrCreateTag().getDouble("chargingtime") > 127 && stack.getOrCreateTag().getDouble("charging") == 1) { + if (stack.getOrCreateTag().getDouble("charging_time") > 127 && stack.getOrCreateTag().getDouble("charging") == 1) { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sentinel.chargep")); } - if (stack.getOrCreateTag().getDouble("chargingtime") < 127 && stack.getOrCreateTag().getDouble("chargingtime") > 0 && stack.getOrCreateTag().getDouble("charging") == 1) { + if (stack.getOrCreateTag().getDouble("charging_time") < 127 && stack.getOrCreateTag().getDouble("charging_time") > 0 && stack.getOrCreateTag().getDouble("charging") == 1) { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sentinel.charge")); } diff --git a/src/main/java/net/mcreator/target/item/gun/SksItem.java b/src/main/java/net/mcreator/target/item/gun/SksItem.java index f2127db9c..242021e1c 100644 --- a/src/main/java/net/mcreator/target/item/gun/SksItem.java +++ b/src/main/java/net/mcreator/target/item/gun/SksItem.java @@ -82,7 +82,7 @@ public class SksItem extends GunItem implements GeoItem, AnimatedItem { if (this.animationProcedure.equals("empty")) { - if (stack.getOrCreateTag().getDouble("drawtime") < 16) { + if (stack.getOrCreateTag().getInt("draw_time") < 16) { return event.setAndContinue(RawAnimation.begin().thenLoop("animation.sks.draw")); } diff --git a/src/main/java/net/mcreator/target/item/gun/SvdItem.java b/src/main/java/net/mcreator/target/item/gun/SvdItem.java index 3b055ba8e..77706d38a 100644 --- a/src/main/java/net/mcreator/target/item/gun/SvdItem.java +++ b/src/main/java/net/mcreator/target/item/gun/SvdItem.java @@ -77,7 +77,7 @@ public class SvdItem extends GunItem implements GeoItem, AnimatedItem { if (this.animationProcedure.equals("empty")) { var tag = stack.getOrCreateTag(); - if (tag.getDouble("drawtime") < 16) { + if (tag.getInt("draw_time") < 16) { return event.setAndContinue(RawAnimation.begin().thenLoop("animation.svd.draw")); } diff --git a/src/main/java/net/mcreator/target/item/gun/Taser.java b/src/main/java/net/mcreator/target/item/gun/Taser.java index 72876d083..cd98831fd 100644 --- a/src/main/java/net/mcreator/target/item/gun/Taser.java +++ b/src/main/java/net/mcreator/target/item/gun/Taser.java @@ -84,7 +84,7 @@ public class Taser extends GunItem implements GeoItem, AnimatedItem { if (this.animationProcedure.equals("empty")) { - if (stack.getOrCreateTag().getDouble("drawtime") < 11) { + if (stack.getOrCreateTag().getInt("draw_time") < 11) { return event.setAndContinue(RawAnimation.begin().thenLoop("animation.taser.draw")); } diff --git a/src/main/java/net/mcreator/target/item/gun/Trachelium.java b/src/main/java/net/mcreator/target/item/gun/Trachelium.java index 11a1010f7..aa77a89ad 100644 --- a/src/main/java/net/mcreator/target/item/gun/Trachelium.java +++ b/src/main/java/net/mcreator/target/item/gun/Trachelium.java @@ -88,7 +88,7 @@ public class Trachelium extends GunItem implements GeoItem, AnimatedItem { ItemStack stack = player.getMainHandItem(); if (this.animationProcedure.equals("empty")) { - if (stack.getOrCreateTag().getDouble("drawtime") < 11) { + if (stack.getOrCreateTag().getInt("draw_time") < 11) { return event.setAndContinue(RawAnimation.begin().thenLoop("animation.trachelium.draw")); } diff --git a/src/main/java/net/mcreator/target/item/gun/VectorItem.java b/src/main/java/net/mcreator/target/item/gun/VectorItem.java index f1c7d9f4c..413d95efd 100644 --- a/src/main/java/net/mcreator/target/item/gun/VectorItem.java +++ b/src/main/java/net/mcreator/target/item/gun/VectorItem.java @@ -164,7 +164,7 @@ public class VectorItem extends GunItem implements GeoItem, AnimatedItem { ItemStack stack = player.getMainHandItem(); if (this.animationProcedure.equals("empty")) { - if (stack.getOrCreateTag().getDouble("drawtime") < 11) { + if (stack.getOrCreateTag().getInt("draw_time") < 11) { return event.setAndContinue(RawAnimation.begin().thenLoop("animation.vec.draw")); } diff --git a/src/main/java/net/mcreator/target/network/FireModeMessage.java b/src/main/java/net/mcreator/target/network/FireModeMessage.java index a8d2015ea..5b8f6f22e 100644 --- a/src/main/java/net/mcreator/target/network/FireModeMessage.java +++ b/src/main/java/net/mcreator/target/network/FireModeMessage.java @@ -70,7 +70,7 @@ public class FireModeMessage { ItemStack mainHandItem = player.getMainHandItem(); CompoundTag tag = mainHandItem.getOrCreateTag(); Item item = mainHandItem.getItem(); - int fireMode = (int) tag.getInt("fire_mode"); + int fireMode = tag.getInt("fire_mode"); if (item == TargetModItems.AK_47.get() || item == TargetModItems.M_4.get() @@ -86,7 +86,7 @@ public class FireModeMessage { if (item == TargetModItems.SENTINEL.get() && !(player.getCooldowns().isOnCooldown(item)) && tag.getDouble("charging") == 0) { tag.putDouble("charging", 1); tag.putDouble("cid", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - tag.putDouble("chargingtime", 128); + tag.putDouble("charging_time", 128); } } } diff --git a/src/main/java/net/mcreator/target/procedures/SentinelWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java b/src/main/java/net/mcreator/target/procedures/SentinelWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java index 493207ab0..78e008939 100644 --- a/src/main/java/net/mcreator/target/procedures/SentinelWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/SentinelWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java @@ -73,17 +73,17 @@ public class SentinelWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { if (itemstack.getOrCreateTag().getDouble("firing") > 0) { itemstack.getOrCreateTag().putDouble("firing", (itemstack.getOrCreateTag().getDouble("firing") - 1)); } - if (itemstack.getOrCreateTag().getDouble("zoom_firing") > 0) { - itemstack.getOrCreateTag().putDouble("zoom_firing", (itemstack.getOrCreateTag().getDouble("zoom_firing") - 1)); + if (itemstack.getOrCreateTag().getDouble("zoom_speed") > 0) { + itemstack.getOrCreateTag().putDouble("zoom_speed", (itemstack.getOrCreateTag().getDouble("zoom_speed") - 1)); } cid = itemstack.getOrCreateTag().getDouble("cid"); if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("cid") != itemstack.getOrCreateTag().getDouble("cid")) { itemstack.getOrCreateTag().putDouble("charging", 0); - itemstack.getOrCreateTag().putDouble("chargingtime", 0); + itemstack.getOrCreateTag().putDouble("charging_time", 0); } if (itemstack.getOrCreateTag().getDouble("charging") == 1) { - if (itemstack.getOrCreateTag().getDouble("chargingtime") == 127) { + if (itemstack.getOrCreateTag().getDouble("charging_time") == 127) { entity.getPersistentData().putDouble("cid", cid); { Entity _ent = entity; @@ -95,17 +95,17 @@ public class SentinelWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { } if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == itemstack.getItem() && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("cid") == cid) { - if (itemstack.getOrCreateTag().getDouble("chargingtime") > 0) { - itemstack.getOrCreateTag().putDouble("chargingtime", (itemstack.getOrCreateTag().getDouble("chargingtime") - 1)); + if (itemstack.getOrCreateTag().getDouble("charging_time") > 0) { + itemstack.getOrCreateTag().putDouble("charging_time", (itemstack.getOrCreateTag().getDouble("charging_time") - 1)); } } else { itemstack.getOrCreateTag().putDouble("charging", 0); - itemstack.getOrCreateTag().putDouble("chargingtime", 0); + itemstack.getOrCreateTag().putDouble("charging_time", 0); } - if (itemstack.getOrCreateTag().getDouble("chargingtime") == 16 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("cid") == cid) { + if (itemstack.getOrCreateTag().getDouble("charging_time") == 16 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("cid") == cid) { itemstack.getOrCreateTag().putDouble("power", 100); } - if (itemstack.getOrCreateTag().getDouble("chargingtime") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("cid") == cid) { + if (itemstack.getOrCreateTag().getDouble("charging_time") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("cid") == cid) { itemstack.getOrCreateTag().putDouble("charging", 0); } } diff --git a/src/main/java/net/mcreator/target/tools/TooltipTool.java b/src/main/java/net/mcreator/target/tools/TooltipTool.java index 665133757..fde0acead 100644 --- a/src/main/java/net/mcreator/target/tools/TooltipTool.java +++ b/src/main/java/net/mcreator/target/tools/TooltipTool.java @@ -84,7 +84,7 @@ public class TooltipTool { public static void addSentinelTips(List tooltip, ItemStack stack) { tooltip.add(Component.literal("")); - boolean flag = ItemNBTTool.getDouble(stack, "chargingtime", 0) > 0; + boolean flag = ItemNBTTool.getDouble(stack, "charging_time", 0) > 0; if (flag) { double damage = (ItemNBTTool.getDouble(stack, "damage", 0) + diff --git a/src/main/resources/data/target/guns/aa_12.json b/src/main/resources/data/target/guns/aa_12.json index e47c19f89..3c73e4893 100644 --- a/src/main/resources/data/target/guns/aa_12.json +++ b/src/main/resources/data/target/guns/aa_12.json @@ -1,14 +1,14 @@ { - "zoomspeed": 0.95, + "zoom_speed": 0.95, "zoom": 1.25, "dev": 3.5, - "recoilx": 0.016, - "recoily": 0.007, + "recoil_x": 0.016, + "recoil_y": 0.007, "damage": 1.5, "headshot": 1.5, "velocity": 16, "mag": 25, - "projectileamount": 8, + "projectile_amount": 8, "fire_interval": 4, "weight": 1 } diff --git a/src/main/resources/data/target/guns/abekiri.json b/src/main/resources/data/target/guns/abekiri.json index cfa043438..a98e7aa4b 100644 --- a/src/main/resources/data/target/guns/abekiri.json +++ b/src/main/resources/data/target/guns/abekiri.json @@ -1,14 +1,14 @@ { - "zoomspeed": 1.4, + "zoom_speed": 1.4, "zoom": 1.25, "dev": 5, - "recoilx": 0.005, - "recoily": 0.026, + "recoil_x": 0.005, + "recoil_y": 0.026, "damage": 2.5, "headshot": 1.5, "velocity": 15, "mag": 2, - "projectileamount": 8, + "projectile_amount": 8, "fire_interval": 2, "weight": 0 } \ No newline at end of file diff --git a/src/main/resources/data/target/guns/ak_47.json b/src/main/resources/data/target/guns/ak_47.json index 1a0b9da05..ea577f92c 100644 --- a/src/main/resources/data/target/guns/ak_47.json +++ b/src/main/resources/data/target/guns/ak_47.json @@ -1,14 +1,14 @@ { - "zoomspeed": 1.1, + "zoom_speed": 1.1, "zoom": 1.25, "dev": 4, - "recoilx": 0.0025, - "recoily": 0.012, + "recoil_x": 0.0025, + "recoil_y": 0.012, "damage": 8.5, "headshot": 1.75, "velocity": 30, "mag": 30, - "projectileamount": 1, + "projectile_amount": 1, "fire_interval": 2, "weight": 1 } \ No newline at end of file diff --git a/src/main/resources/data/target/guns/bocek.json b/src/main/resources/data/target/guns/bocek.json index 7aac33a23..351040ed6 100644 --- a/src/main/resources/data/target/guns/bocek.json +++ b/src/main/resources/data/target/guns/bocek.json @@ -1,9 +1,9 @@ { - "zoomspeed": 1, + "zoom_speed": 1, "zoom": 2, "dev": 4, - "recoilx": 0.005, - "recoily": 0.003, + "recoil_x": 0.005, + "recoil_y": 0.003, "headshot": 1.5, "damage": 24, "weight": 1, diff --git a/src/main/resources/data/target/guns/devotion.json b/src/main/resources/data/target/guns/devotion.json index 81611b3e7..96ce94b37 100644 --- a/src/main/resources/data/target/guns/devotion.json +++ b/src/main/resources/data/target/guns/devotion.json @@ -1,16 +1,16 @@ { - "zoomspeed": 0.9, + "zoom_speed": 0.9, "zoom": 2, "dev": 5, "bipod": 1, - "recoilx": 0.0018, - "recoily": 0.01, + "recoil_x": 0.0018, + "recoil_y": 0.01, "damage": 7, "headshot": 2, "velocity": 40, "mag": 55, - "firemode": 2, - "projectileamount": 1, + "fire_mode": 2, + "projectile_amount": 1, "fire_interval": 5, "weight": 1 } \ No newline at end of file diff --git a/src/main/resources/data/target/guns/hk_416.json b/src/main/resources/data/target/guns/hk_416.json index c1f43e0d3..32333f34f 100644 --- a/src/main/resources/data/target/guns/hk_416.json +++ b/src/main/resources/data/target/guns/hk_416.json @@ -1,14 +1,14 @@ { - "zoomspeed": 1.3, + "zoom_speed": 1.3, "zoom": 1.25, "dev": 4, - "recoilx": 0.0016, - "recoily": 0.009, + "recoil_x": 0.0016, + "recoil_y": 0.009, "damage": 7.5, "headshot": 2, "velocity": 45, "mag": 30, - "projectileamount": 1, + "projectile_amount": 1, "fire_interval": 1, "weight": 1 } \ No newline at end of file diff --git a/src/main/resources/data/target/guns/hunting_rifle.json b/src/main/resources/data/target/guns/hunting_rifle.json index 62762b502..3b58d23d7 100644 --- a/src/main/resources/data/target/guns/hunting_rifle.json +++ b/src/main/resources/data/target/guns/hunting_rifle.json @@ -1,13 +1,13 @@ { - "zoomspeed": 1, + "zoom_speed": 1, "zoom": 1.25, "dev": 7, - "recoilx": 0.004, - "recoily": 0.03, + "recoil_x": 0.004, + "recoil_y": 0.03, "damage": 40, "headshot": 3, "velocity": 50, "mag": 1, - "projectileamount": 1, + "projectile_amount": 1, "weight": 1 } \ No newline at end of file diff --git a/src/main/resources/data/target/guns/kraber.json b/src/main/resources/data/target/guns/kraber.json index 3cb456d89..171e38106 100644 --- a/src/main/resources/data/target/guns/kraber.json +++ b/src/main/resources/data/target/guns/kraber.json @@ -1,14 +1,14 @@ { - "zoomspeed": 0.8, + "zoom_speed": 0.8, "zoom": 3, "bipod": 1, "dev": 6, - "recoilx": 0.008, - "recoily": 0.018, + "recoil_x": 0.008, + "recoil_y": 0.018, "damage": 70, "headshot": 3, "velocity": 40, - "projectileamount": 1, + "projectile_amount": 1, "mag": 4, "fire_interval": 10, "bolt_action_time": 30, diff --git a/src/main/resources/data/target/guns/m_4.json b/src/main/resources/data/target/guns/m_4.json index 79d53f71f..c700f940e 100644 --- a/src/main/resources/data/target/guns/m_4.json +++ b/src/main/resources/data/target/guns/m_4.json @@ -1,14 +1,14 @@ { - "zoomspeed": 1.15, + "zoom_speed": 1.15, "zoom": 1.25, "dev": 4, - "recoilx": 0.0015, - "recoily": 0.011, + "recoil_x": 0.0015, + "recoil_y": 0.011, "damage": 7, "headshot": 2, "velocity": 45, "mag": 30, - "projectileamount": 1, + "projectile_amount": 1, "fire_interval": 1, "weight": 1 } \ No newline at end of file diff --git a/src/main/resources/data/target/guns/m_60.json b/src/main/resources/data/target/guns/m_60.json index 30ff16d8b..275ac7abf 100644 --- a/src/main/resources/data/target/guns/m_60.json +++ b/src/main/resources/data/target/guns/m_60.json @@ -1,16 +1,16 @@ { - "zoomspeed": 0.85, + "zoom_speed": 0.85, "zoom": 1.25, "dev": 5, "bipod": 1, - "recoilx": 0.004, - "recoily": 0.014, + "recoil_x": 0.004, + "recoil_y": 0.014, "damage": 9, "headshot": 2, "velocity": 40, "mag": 100, - "firemode": 2, - "projectileamount": 1, + "fire_mode": 2, + "projectile_amount": 1, "fire_interval": 2, "weight": 2 } \ No newline at end of file diff --git a/src/main/resources/data/target/guns/m_79.json b/src/main/resources/data/target/guns/m_79.json index 6ac1d8960..8539a2c9c 100644 --- a/src/main/resources/data/target/guns/m_79.json +++ b/src/main/resources/data/target/guns/m_79.json @@ -1,9 +1,9 @@ { - "zoomspeed": 0.95, + "zoom_speed": 0.95, "zoom": 1.25, "dev": 1, - "recoilx": 0.004, - "recoily": 0.023, + "recoil_x": 0.004, + "recoil_y": 0.023, "damage": 40, "velocity": 3.75, "mag": 1, diff --git a/src/main/resources/data/target/guns/m_870.json b/src/main/resources/data/target/guns/m_870.json index 356336d39..fb384faf9 100644 --- a/src/main/resources/data/target/guns/m_870.json +++ b/src/main/resources/data/target/guns/m_870.json @@ -1,9 +1,9 @@ { - "zoomspeed": 1.1, + "zoom_speed": 1.1, "zoom": 1.25, "dev": 3, - "recoilx": 0.009, - "recoily": 0.03, + "recoil_x": 0.009, + "recoil_y": 0.03, "damage": 2, "headshot": 1.5, "velocity": 20, diff --git a/src/main/resources/data/target/guns/m_98b.json b/src/main/resources/data/target/guns/m_98b.json index 8e6d6bdd5..b98c06d3b 100644 --- a/src/main/resources/data/target/guns/m_98b.json +++ b/src/main/resources/data/target/guns/m_98b.json @@ -1,13 +1,13 @@ { - "zoomspeed": 0.85, + "zoom_speed": 0.85, "zoom": 4, "dev": 6, - "recoilx": 0.007, - "recoily": 0.013, + "recoil_x": 0.007, + "recoil_y": 0.013, "damage": 28, "headshot": 3, "velocity": 55, - "projectileamount": 1, + "projectile_amount": 1, "mag": 5, "fire_interval": 6, "bolt_action_time": 18, diff --git a/src/main/resources/data/target/guns/marlin.json b/src/main/resources/data/target/guns/marlin.json index 40f4c49ac..870230ef2 100644 --- a/src/main/resources/data/target/guns/marlin.json +++ b/src/main/resources/data/target/guns/marlin.json @@ -1,9 +1,9 @@ { - "zoomspeed": 1.1, + "zoom_speed": 1.1, "zoom": 1.25, "dev": 2, - "recoilx": 0.004, - "recoily": 0.011, + "recoil_x": 0.004, + "recoil_y": 0.011, "damage": 16, "headshot": 2.5, "velocity": 27, diff --git a/src/main/resources/data/target/guns/minigun.json b/src/main/resources/data/target/guns/minigun.json index 9602672f0..966a47371 100644 --- a/src/main/resources/data/target/guns/minigun.json +++ b/src/main/resources/data/target/guns/minigun.json @@ -1,12 +1,12 @@ { "zoom": 1, "dev": 5, - "recoilx": 0.024, - "recoily": 0.005, + "recoil_x": 0.024, + "recoil_y": 0.005, "damage": 8, "headshot": 2, "velocity": 40, - "firemode": 2, + "fire_mode": 2, "fire_interval": 1, "weight": 2 } \ No newline at end of file diff --git a/src/main/resources/data/target/guns/mk_14.json b/src/main/resources/data/target/guns/mk_14.json index 0e757ac4e..caed363b2 100644 --- a/src/main/resources/data/target/guns/mk_14.json +++ b/src/main/resources/data/target/guns/mk_14.json @@ -1,15 +1,15 @@ { - "zoomspeed": 0.9, + "zoom_speed": 0.9, "zoom": 3.4, "dev": 6, "bipod": 1, - "recoilx": 0.006, - "recoily": 0.014, + "recoil_x": 0.006, + "recoil_y": 0.014, "damage": 12, "headshot": 2.5, "velocity": 45, "mag": 20, - "projectileamount": 1, + "projectile_amount": 1, "fire_interval": 2, "weight": 1 } \ No newline at end of file diff --git a/src/main/resources/data/target/guns/rpg.json b/src/main/resources/data/target/guns/rpg.json index 0fc990ff3..e72da69eb 100644 --- a/src/main/resources/data/target/guns/rpg.json +++ b/src/main/resources/data/target/guns/rpg.json @@ -1,9 +1,9 @@ { - "zoomspeed": 0.77, + "zoom_speed": 0.77, "zoom": 1.25, "dev": 5, - "recoilx": 0.008, - "recoily": 0.018, + "recoil_x": 0.008, + "recoil_y": 0.018, "damage": 150, "velocity": 5.75, "mag": 1, diff --git a/src/main/resources/data/target/guns/rpk.json b/src/main/resources/data/target/guns/rpk.json index 5edc98f52..bd35efdbd 100644 --- a/src/main/resources/data/target/guns/rpk.json +++ b/src/main/resources/data/target/guns/rpk.json @@ -1,15 +1,15 @@ { - "zoomspeed": 1, + "zoom_speed": 1, "zoom": 1.25, "dev": 5, "bipod": 1, - "recoilx": 0.0035, - "recoily": 0.012, + "recoil_x": 0.0035, + "recoil_y": 0.012, "damage": 8.75, "headshot": 2, "velocity": 35, "mag": 75, - "projectileamount": 1, + "projectile_amount": 1, "fire_interval": 2, "weight": 1 } \ No newline at end of file diff --git a/src/main/resources/data/target/guns/sentinel.json b/src/main/resources/data/target/guns/sentinel.json index da07e1be0..17a3c0f9b 100644 --- a/src/main/resources/data/target/guns/sentinel.json +++ b/src/main/resources/data/target/guns/sentinel.json @@ -1,12 +1,12 @@ { - "zoomspeed": 0.95, + "zoom_speed": 0.95, "zoom": 3, "dev": 6, - "recoilx": 0.007, - "recoily": 0.018, + "recoil_x": 0.007, + "recoil_y": 0.018, "damage": 25, "mag": 5, - "projectileamount": 1, + "projectile_amount": 1, "headshot": 2, "velocity": 50, "fire_interval": 2, diff --git a/src/main/resources/data/target/guns/sks.json b/src/main/resources/data/target/guns/sks.json index 37208751e..04751bb0b 100644 --- a/src/main/resources/data/target/guns/sks.json +++ b/src/main/resources/data/target/guns/sks.json @@ -1,14 +1,14 @@ { - "zoomspeed": 1, + "zoom_speed": 1, "zoom": 1.25, "dev": 5, - "recoilx": 0.004, - "recoily": 0.015, + "recoil_x": 0.004, + "recoil_y": 0.015, "damage": 9.5, "headshot": 1.75, "velocity": 40, "mag": 20, - "projectileamount": 1, + "projectile_amount": 1, "fire_interval": 3, "weight": 1 } \ No newline at end of file diff --git a/src/main/resources/data/target/guns/svd.json b/src/main/resources/data/target/guns/svd.json index 1f3715758..e60f16884 100644 --- a/src/main/resources/data/target/guns/svd.json +++ b/src/main/resources/data/target/guns/svd.json @@ -1,14 +1,14 @@ { - "zoomspeed": 0.9, + "zoom_speed": 0.9, "zoom": 4, "dev": 6, - "recoilx": 0.008, - "recoily": 0.015, + "recoil_x": 0.008, + "recoil_y": 0.015, "damage": 18, "headshot": 2.5, "velocity": 50, "mag": 10, - "projectileamount": 1, + "projectile_amount": 1, "fire_interval": 5, "weight": 1 } \ No newline at end of file diff --git a/src/main/resources/data/target/guns/taser.json b/src/main/resources/data/target/guns/taser.json index 40444ab3a..7729c3bda 100644 --- a/src/main/resources/data/target/guns/taser.json +++ b/src/main/resources/data/target/guns/taser.json @@ -1,8 +1,8 @@ { "dev": 2, - "recoilx": 0.0001, - "recoily": 0.002, - "zoomspeed": 2, + "recoil_x": 0.0001, + "recoil_y": 0.002, + "zoom_speed": 2, "zoom": 1.25, "damage": 5, "velocity": 3, diff --git a/src/main/resources/data/target/guns/trachelium.json b/src/main/resources/data/target/guns/trachelium.json index 3369c6697..4a7c6b927 100644 --- a/src/main/resources/data/target/guns/trachelium.json +++ b/src/main/resources/data/target/guns/trachelium.json @@ -1,14 +1,14 @@ { - "zoomspeed": 1.7, + "zoom_speed": 1.7, "zoom": 1.25, "dev": 3, - "recoilx": 0.005, - "recoily": 0.022, + "recoil_x": 0.005, + "recoil_y": 0.022, "damage": 18, "headshot": 1.5, "velocity": 60, "mag": 8, - "projectileamount": 1, + "projectile_amount": 1, "fire_interval": 5, "weight": 0 } \ No newline at end of file diff --git a/src/main/resources/data/target/guns/vector.json b/src/main/resources/data/target/guns/vector.json index 17e05f04d..9b6185827 100644 --- a/src/main/resources/data/target/guns/vector.json +++ b/src/main/resources/data/target/guns/vector.json @@ -1,14 +1,14 @@ { - "zoomspeed": 1.6, + "zoom_speed": 1.6, "zoom": 1.25, "dev": 3.5, - "recoilx": 0.011, - "recoily": 0.004, + "recoil_x": 0.011, + "recoil_y": 0.004, "damage": 4.5, "headshot": 1.5, "velocity": 22, "mag": 33, - "projectileamount": 1, + "projectile_amount": 1, "fire_interval": 1, "weight": 0 } \ No newline at end of file