diff --git a/src/main/java/net/mcreator/target/item/LightSaberItem.java b/src/main/java/net/mcreator/target/item/LightSaberItem.java index 90790ffee..dab7e10f3 100644 --- a/src/main/java/net/mcreator/target/item/LightSaberItem.java +++ b/src/main/java/net/mcreator/target/item/LightSaberItem.java @@ -81,9 +81,9 @@ public class LightSaberItem extends SwordItem implements GeoItem, AnimatedItem { @Override public void registerControllers(AnimatableManager.ControllerRegistrar data) { - AnimationController procedureController = new AnimationController(this, "procedureController", 0, this::procedurePredicate); + var procedureController = new AnimationController<>(this, "procedureController", 0, this::procedurePredicate); data.add(procedureController); - AnimationController idleController = new AnimationController(this, "idleController", 0, this::idlePredicate); + var idleController = new AnimationController<>(this, "idleController", 0, this::idlePredicate); data.add(idleController); } diff --git a/src/main/java/net/mcreator/target/item/common/ammo/Rocket.java b/src/main/java/net/mcreator/target/item/common/ammo/Rocket.java index 0cc635899..ad1b6ef6d 100644 --- a/src/main/java/net/mcreator/target/item/common/ammo/Rocket.java +++ b/src/main/java/net/mcreator/target/item/common/ammo/Rocket.java @@ -84,9 +84,9 @@ public class Rocket extends Item implements GeoItem, AnimatedItem { @Override public void registerControllers(AnimatableManager.ControllerRegistrar data) { - AnimationController procedureController = new AnimationController(this, "procedureController", 0, this::procedurePredicate); + var procedureController = new AnimationController<>(this, "procedureController", 0, this::procedurePredicate); data.add(procedureController); - AnimationController idleController = new AnimationController(this, "idleController", 0, this::idlePredicate); + var idleController = new AnimationController<>(this, "idleController", 0, this::idlePredicate); data.add(idleController); } 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 a084c0ebb..0465a5f8d 100644 --- a/src/main/java/net/mcreator/target/item/gun/AK47Item.java +++ b/src/main/java/net/mcreator/target/item/gun/AK47Item.java @@ -138,9 +138,9 @@ public class AK47Item extends GunItem implements GeoItem, AnimatedItem { @Override public void registerControllers(AnimatableManager.ControllerRegistrar data) { - AnimationController procedureController = new AnimationController(this, "procedureController", 0, this::procedurePredicate); + var procedureController = new AnimationController<>(this, "procedureController", 0, this::procedurePredicate); data.add(procedureController); - AnimationController idleController = new AnimationController(this, "idleController", 4, this::idlePredicate); + var idleController = new AnimationController<>(this, "idleController", 4, this::idlePredicate); data.add(idleController); } 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 b44bdb1bf..ed9571278 100644 --- a/src/main/java/net/mcreator/target/item/gun/Aa12Item.java +++ b/src/main/java/net/mcreator/target/item/gun/Aa12Item.java @@ -134,9 +134,9 @@ public class Aa12Item extends GunItem implements GeoItem, AnimatedItem { @Override public void registerControllers(AnimatableManager.ControllerRegistrar data) { - AnimationController procedureController = new AnimationController(this, "procedureController", 0, this::procedurePredicate); + var procedureController = new AnimationController<>(this, "procedureController", 0, this::procedurePredicate); data.add(procedureController); - AnimationController idleController = new AnimationController(this, "idleController", 4, this::idlePredicate); + var idleController = new AnimationController<>(this, "idleController", 4, this::idlePredicate); data.add(idleController); } 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 d365ee653..7861c29fd 100644 --- a/src/main/java/net/mcreator/target/item/gun/Abekiri.java +++ b/src/main/java/net/mcreator/target/item/gun/Abekiri.java @@ -129,9 +129,9 @@ public class Abekiri extends GunItem implements GeoItem, AnimatedItem { @Override public void registerControllers(AnimatableManager.ControllerRegistrar data) { - AnimationController procedureController = new AnimationController(this, "procedureController", 0, this::procedurePredicate); + var procedureController = new AnimationController<>(this, "procedureController", 0, this::procedurePredicate); data.add(procedureController); - AnimationController idleController = new AnimationController(this, "idleController", 4, this::idlePredicate); + var idleController = new AnimationController<>(this, "idleController", 4, this::idlePredicate); data.add(idleController); } 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 ba7f0a178..ac743af82 100644 --- a/src/main/java/net/mcreator/target/item/gun/BocekItem.java +++ b/src/main/java/net/mcreator/target/item/gun/BocekItem.java @@ -105,9 +105,9 @@ public class BocekItem extends GunItem implements GeoItem, AnimatedItem { @Override public void registerControllers(AnimatableManager.ControllerRegistrar data) { - AnimationController procedureController = new AnimationController(this, "procedureController", 0, this::procedurePredicate); + var procedureController = new AnimationController<>(this, "procedureController", 0, this::procedurePredicate); data.add(procedureController); - AnimationController idleController = new AnimationController(this, "idleController", 4, this::idlePredicate); + var idleController = new AnimationController<>(this, "idleController", 4, this::idlePredicate); data.add(idleController); } 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 f20e11551..539291174 100644 --- a/src/main/java/net/mcreator/target/item/gun/Devotion.java +++ b/src/main/java/net/mcreator/target/item/gun/Devotion.java @@ -123,9 +123,9 @@ public class Devotion extends GunItem implements GeoItem, AnimatedItem { @Override public void registerControllers(AnimatableManager.ControllerRegistrar data) { - AnimationController procedureController = new AnimationController(this, "procedureController", 0, this::procedurePredicate); + var procedureController = new AnimationController<>(this, "procedureController", 0, this::procedurePredicate); data.add(procedureController); - AnimationController idleController = new AnimationController(this, "idleController", 4, this::idlePredicate); + var idleController = new AnimationController<>(this, "idleController", 4, this::idlePredicate); data.add(idleController); } 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 675730727..2e49637da 100644 --- a/src/main/java/net/mcreator/target/item/gun/Hk416Item.java +++ b/src/main/java/net/mcreator/target/item/gun/Hk416Item.java @@ -133,9 +133,9 @@ public class Hk416Item extends GunItem implements GeoItem, AnimatedItem { @Override public void registerControllers(AnimatableManager.ControllerRegistrar data) { - AnimationController procedureController = new AnimationController(this, "procedureController", 0, this::procedurePredicate); + var procedureController = new AnimationController<>(this, "procedureController", 0, this::procedurePredicate); data.add(procedureController); - AnimationController idleController = new AnimationController(this, "idleController", 4, this::idlePredicate); + var idleController = new AnimationController<>(this, "idleController", 4, this::idlePredicate); data.add(idleController); } 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 065f63755..5f5a45d94 100644 --- a/src/main/java/net/mcreator/target/item/gun/HuntingRifle.java +++ b/src/main/java/net/mcreator/target/item/gun/HuntingRifle.java @@ -122,9 +122,9 @@ public class HuntingRifle extends GunItem implements GeoItem, AnimatedItem { @Override public void registerControllers(AnimatableManager.ControllerRegistrar data) { - AnimationController procedureController = new AnimationController(this, "procedureController", 0, this::procedurePredicate); + var procedureController = new AnimationController<>(this, "procedureController", 0, this::procedurePredicate); data.add(procedureController); - AnimationController idleController = new AnimationController(this, "idleController", 4, this::idlePredicate); + var idleController = new AnimationController<>(this, "idleController", 4, this::idlePredicate); data.add(idleController); } 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 c8c96374d..cbf06844e 100644 --- a/src/main/java/net/mcreator/target/item/gun/Kraber.java +++ b/src/main/java/net/mcreator/target/item/gun/Kraber.java @@ -137,9 +137,9 @@ public class Kraber extends GunItem implements GeoItem, AnimatedItem { @Override public void registerControllers(AnimatableManager.ControllerRegistrar data) { - AnimationController procedureController = new AnimationController(this, "procedureController", 0, this::procedurePredicate); + var procedureController = new AnimationController<>(this, "procedureController", 0, this::procedurePredicate); data.add(procedureController); - AnimationController idleController = new AnimationController(this, "idleController", 4, this::idlePredicate); + var idleController = new AnimationController<>(this, "idleController", 4, this::idlePredicate); data.add(idleController); } 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 210b64c44..f99beb1f0 100644 --- a/src/main/java/net/mcreator/target/item/gun/M4Item.java +++ b/src/main/java/net/mcreator/target/item/gun/M4Item.java @@ -133,9 +133,9 @@ public class M4Item extends GunItem implements GeoItem, AnimatedItem { @Override public void registerControllers(AnimatableManager.ControllerRegistrar data) { - AnimationController procedureController = new AnimationController(this, "procedureController", 0, this::procedurePredicate); + var procedureController = new AnimationController<>(this, "procedureController", 0, this::procedurePredicate); data.add(procedureController); - AnimationController idleController = new AnimationController(this, "idleController", 3, this::idlePredicate); + var idleController = new AnimationController<>(this, "idleController", 3, this::idlePredicate); data.add(idleController); } 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 9a47d605f..0f479457f 100644 --- a/src/main/java/net/mcreator/target/item/gun/M60Item.java +++ b/src/main/java/net/mcreator/target/item/gun/M60Item.java @@ -137,9 +137,9 @@ public class M60Item extends GunItem implements GeoItem, AnimatedItem { @Override public void registerControllers(AnimatableManager.ControllerRegistrar data) { - AnimationController procedureController = new AnimationController(this, "procedureController", 0, this::procedurePredicate); + var procedureController = new AnimationController<>(this, "procedureController", 0, this::procedurePredicate); data.add(procedureController); - AnimationController idleController = new AnimationController(this, "idleController", 4, this::idlePredicate); + var idleController = new AnimationController<>(this, "idleController", 4, this::idlePredicate); data.add(idleController); } 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 cf331f0b2..b3eb5e214 100644 --- a/src/main/java/net/mcreator/target/item/gun/M79Item.java +++ b/src/main/java/net/mcreator/target/item/gun/M79Item.java @@ -122,9 +122,9 @@ public class M79Item extends GunItem implements GeoItem, AnimatedItem { @Override public void registerControllers(AnimatableManager.ControllerRegistrar data) { - AnimationController procedureController = new AnimationController(this, "procedureController", 0, this::procedurePredicate); + var procedureController = new AnimationController<>(this, "procedureController", 0, this::procedurePredicate); data.add(procedureController); - AnimationController idleController = new AnimationController(this, "idleController", 4, this::idlePredicate); + var idleController = new AnimationController<>(this, "idleController", 4, this::idlePredicate); data.add(idleController); } 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 85f7bc96f..0c1b2aca1 100644 --- a/src/main/java/net/mcreator/target/item/gun/M870Item.java +++ b/src/main/java/net/mcreator/target/item/gun/M870Item.java @@ -141,9 +141,9 @@ public class M870Item extends GunItem implements GeoItem, AnimatedItem { @Override public void registerControllers(AnimatableManager.ControllerRegistrar data) { - AnimationController procedureController = new AnimationController(this, "procedureController", 0, this::procedurePredicate); + var procedureController = new AnimationController<>(this, "procedureController", 0, this::procedurePredicate); data.add(procedureController); - AnimationController idleController = new AnimationController(this, "idleController", 4, this::idlePredicate); + var idleController = new AnimationController<>(this, "idleController", 4, this::idlePredicate); data.add(idleController); } @@ -186,7 +186,7 @@ public class M870Item extends GunItem implements GeoItem, AnimatedItem { } if (tag.getBoolean("reloading") && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { if (tag.getDouble("prepare") == 10 && tag.getBoolean("empty_reload")) { - tag.putInt("ammo", (tag.getInt("ammo") + 1)); + tag.putInt("ammo", tag.getInt("ammo") + 1); entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> { capability.shotgunAmmo = capability.shotgunAmmo - 1; capability.syncPlayerVariables(entity); @@ -214,7 +214,7 @@ public class M870Item extends GunItem implements GeoItem, AnimatedItem { capability.syncPlayerVariables(entity); }); } - if ((tag.getInt("ammo") >= 8 || (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).shotgunAmmo == 0) + if ((tag.getInt("ammo") >= 8 || entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).map(c -> c.shotgunAmmo).orElse(0) == 0) && tag.getDouble("loading") == 0 || tag.getDouble("stop") == 1) { tag.putDouble("force_stop", 0); tag.putDouble("stop", 0); 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 b83a46f4a..4553964fa 100644 --- a/src/main/java/net/mcreator/target/item/gun/M98bItem.java +++ b/src/main/java/net/mcreator/target/item/gun/M98bItem.java @@ -129,9 +129,9 @@ public class M98bItem extends GunItem implements GeoItem, AnimatedItem { @Override public void registerControllers(AnimatableManager.ControllerRegistrar data) { - AnimationController procedureController = new AnimationController(this, "procedureController", 0, this::procedurePredicate); + var procedureController = new AnimationController<>(this, "procedureController", 0, this::procedurePredicate); data.add(procedureController); - AnimationController idleController = new AnimationController(this, "idleController", 4, this::idlePredicate); + var idleController = new AnimationController<>(this, "idleController", 4, this::idlePredicate); data.add(idleController); } 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 b8d8c933a..7d375d266 100644 --- a/src/main/java/net/mcreator/target/item/gun/MarlinItem.java +++ b/src/main/java/net/mcreator/target/item/gun/MarlinItem.java @@ -148,9 +148,9 @@ public class MarlinItem extends GunItem implements GeoItem, AnimatedItem { @Override public void registerControllers(AnimatableManager.ControllerRegistrar data) { - AnimationController procedureController = new AnimationController(this, "procedureController", 0, this::procedurePredicate); + var procedureController = new AnimationController<>(this, "procedureController", 0, this::procedurePredicate); data.add(procedureController); - AnimationController idleController = new AnimationController(this, "idleController", 4, this::idlePredicate); + var idleController = new AnimationController<>(this, "idleController", 4, this::idlePredicate); data.add(idleController); } @@ -193,7 +193,7 @@ public class MarlinItem extends GunItem implements GeoItem, AnimatedItem { } if (tag.getBoolean("reloading") && player.getMainHandItem().getOrCreateTag().getDouble("id") == id) { if (tag.getDouble("prepare") == 0 && tag.getDouble("loading") == 0 - && !(tag.getInt("ammo") >= 8 || (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleAmmo == 0)) { + && !(tag.getInt("ammo") >= 8 || entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).map(c -> c.rifleAmmo).orElse(0) == 0)) { if (tag.getDouble("force_stop") == 1) { tag.putDouble("stop", 1); } else { @@ -207,9 +207,9 @@ public class MarlinItem extends GunItem implements GeoItem, AnimatedItem { } } if (tag.getDouble("loading") == 9) { - tag.putInt("ammo", (tag.getInt("ammo") + 1)); + tag.putInt("ammo", tag.getInt("ammo") + 1); entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> { - capability.rifleAmmo = entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).map(c -> c.rifleAmmo).orElse(0) - 1; + capability.rifleAmmo = capability.rifleAmmo - 1; capability.syncPlayerVariables(entity); }); } @@ -227,7 +227,7 @@ public class MarlinItem extends GunItem implements GeoItem, AnimatedItem { } } if (tag.getDouble("firing") > 0) { - tag.putDouble("firing", (tag.getDouble("firing") - 1)); + tag.putDouble("firing", tag.getDouble("firing") - 1); } } } 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 bea82a0db..bfe8a2af1 100644 --- a/src/main/java/net/mcreator/target/item/gun/Minigun.java +++ b/src/main/java/net/mcreator/target/item/gun/Minigun.java @@ -142,9 +142,9 @@ public class Minigun extends GunItem implements GeoItem, AnimatedItem { @Override public void registerControllers(AnimatableManager.ControllerRegistrar data) { - AnimationController procedureController = new AnimationController(this, "procedureController", 0, this::procedurePredicate); + var procedureController = new AnimationController<>(this, "procedureController", 0, this::procedurePredicate); data.add(procedureController); - AnimationController idleController = new AnimationController(this, "idleController", 6, this::idlePredicate); + var idleController = new AnimationController<>(this, "idleController", 6, this::idlePredicate); data.add(idleController); } 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 60c0b2869..5faf33b66 100644 --- a/src/main/java/net/mcreator/target/item/gun/Mk14Item.java +++ b/src/main/java/net/mcreator/target/item/gun/Mk14Item.java @@ -133,9 +133,9 @@ public class Mk14Item extends GunItem implements GeoItem, AnimatedItem { @Override public void registerControllers(AnimatableManager.ControllerRegistrar data) { - AnimationController procedureController = new AnimationController(this, "procedureController", 0, this::procedurePredicate); + var procedureController = new AnimationController<>(this, "procedureController", 0, this::procedurePredicate); data.add(procedureController); - AnimationController idleController = new AnimationController(this, "idleController", 4, this::idlePredicate); + var idleController = new AnimationController<>(this, "idleController", 4, this::idlePredicate); data.add(idleController); } 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 1b737e268..0c6996110 100644 --- a/src/main/java/net/mcreator/target/item/gun/RpkItem.java +++ b/src/main/java/net/mcreator/target/item/gun/RpkItem.java @@ -133,9 +133,9 @@ public class RpkItem extends GunItem implements GeoItem, AnimatedItem { @Override public void registerControllers(AnimatableManager.ControllerRegistrar data) { - AnimationController procedureController = new AnimationController(this, "procedureController", 0, this::procedurePredicate); + var procedureController = new AnimationController<>(this, "procedureController", 0, this::procedurePredicate); data.add(procedureController); - AnimationController idleController = new AnimationController(this, "idleController", 4, this::idlePredicate); + var idleController = new AnimationController<>(this, "idleController", 4, this::idlePredicate); data.add(idleController); } 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 8df903ae5..7f118917a 100644 --- a/src/main/java/net/mcreator/target/item/gun/SentinelItem.java +++ b/src/main/java/net/mcreator/target/item/gun/SentinelItem.java @@ -157,9 +157,9 @@ public class SentinelItem extends GunItem implements GeoItem, AnimatedItem { @Override public void registerControllers(AnimatableManager.ControllerRegistrar data) { - AnimationController procedureController = new AnimationController(this, "procedureController", 0, this::procedurePredicate); + var procedureController = new AnimationController<>(this, "procedureController", 0, this::procedurePredicate); data.add(procedureController); - AnimationController idleController = new AnimationController(this, "idleController", 4, this::idlePredicate); + var idleController = new AnimationController<>(this, "idleController", 4, this::idlePredicate); data.add(idleController); } 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 0c2c66dba..6e94318e6 100644 --- a/src/main/java/net/mcreator/target/item/gun/SksItem.java +++ b/src/main/java/net/mcreator/target/item/gun/SksItem.java @@ -130,9 +130,9 @@ public class SksItem extends GunItem implements GeoItem, AnimatedItem { @Override public void registerControllers(AnimatableManager.ControllerRegistrar data) { - AnimationController procedureController = new AnimationController(this, "procedureController", 0, this::procedurePredicate); + var procedureController = new AnimationController<>(this, "procedureController", 0, this::procedurePredicate); data.add(procedureController); - AnimationController idleController = new AnimationController(this, "idleController", 4, this::idlePredicate); + var idleController = new AnimationController<>(this, "idleController", 4, this::idlePredicate); data.add(idleController); } 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 4cf36b8e3..9e2aa67de 100644 --- a/src/main/java/net/mcreator/target/item/gun/SvdItem.java +++ b/src/main/java/net/mcreator/target/item/gun/SvdItem.java @@ -126,9 +126,9 @@ public class SvdItem extends GunItem implements GeoItem, AnimatedItem { @Override public void registerControllers(AnimatableManager.ControllerRegistrar data) { - AnimationController procedureController = new AnimationController(this, "procedureController", 0, this::procedurePredicate); + var procedureController = new AnimationController<>(this, "procedureController", 0, this::procedurePredicate); data.add(procedureController); - AnimationController idleController = new AnimationController(this, "idleController", 4, this::idlePredicate); + var idleController = new AnimationController<>(this, "idleController", 4, this::idlePredicate); data.add(idleController); }