From fb0831c6db94342cd3e09f2adc80c1ac5743f590 Mon Sep 17 00:00:00 2001
From: 17146 <1714673995@qq.com>
Date: Tue, 7 May 2024 22:11:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E7=8E=A9=E5=AE=B6=E5=86=B2?=
=?UTF-8?q?=E5=88=BAprocedure?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
elements/Unsprintable.mod.json | 2 +-
.../target/event/PlayerEventHandler.java | 56 +++++++++++++------
.../mcreator/target/item/gun/AK47Item.java | 2 +-
.../mcreator/target/item/gun/Aa12Item.java | 2 +-
.../net/mcreator/target/item/gun/Abekiri.java | 2 +-
.../mcreator/target/item/gun/Devotion.java | 2 +-
.../mcreator/target/item/gun/Hk416Item.java | 2 +-
.../target/item/gun/HuntingRifle.java | 2 +-
.../net/mcreator/target/item/gun/Kraber.java | 2 +-
.../net/mcreator/target/item/gun/M4Item.java | 2 +-
.../net/mcreator/target/item/gun/M60Item.java | 2 +-
.../net/mcreator/target/item/gun/M79Item.java | 2 +-
.../mcreator/target/item/gun/M870Item.java | 2 +-
.../mcreator/target/item/gun/M98bItem.java | 2 +-
.../mcreator/target/item/gun/MarlinItem.java | 2 +-
.../net/mcreator/target/item/gun/Minigun.java | 2 +-
.../mcreator/target/item/gun/Mk14Item.java | 2 +-
.../net/mcreator/target/item/gun/RpgItem.java | 2 +-
.../net/mcreator/target/item/gun/RpkItem.java | 2 +-
.../target/item/gun/SentinelItem.java | 2 +-
.../net/mcreator/target/item/gun/SksItem.java | 2 +-
.../net/mcreator/target/item/gun/SvdItem.java | 2 +-
.../net/mcreator/target/item/gun/Taser.java | 2 +-
.../mcreator/target/item/gun/Trachelium.java | 2 +-
.../mcreator/target/item/gun/VectorItem.java | 2 +-
.../procedures/UnsprintableProcedure.java | 43 --------------
26 files changed, 64 insertions(+), 83 deletions(-)
delete mode 100644 src/main/java/net/mcreator/target/procedures/UnsprintableProcedure.java
diff --git a/elements/Unsprintable.mod.json b/elements/Unsprintable.mod.json
index 399073ab6..8ff59ab26 100644
--- a/elements/Unsprintable.mod.json
+++ b/elements/Unsprintable.mod.json
@@ -2,6 +2,6 @@
"_fv": 57,
"_type": "procedure",
"definition": {
- "procedurexml": "player_ticksGTfireanim0unspringtable20OROROREQglobal:zoomingTRUEunspringtable1GTunspringtable0unspringtableMINUSunspringtable1EQglobal:zoomingTRUEFALSE"
+ "procedurexml": "player_ticksGTfireanim0noRun20OROROREQglobal:zoomingTRUEnoRun1GTnoRun0noRunMINUSnoRun1EQglobal:zoomingTRUEFALSE"
}
}
\ No newline at end of file
diff --git a/src/main/java/net/mcreator/target/event/PlayerEventHandler.java b/src/main/java/net/mcreator/target/event/PlayerEventHandler.java
index ea49569cf..43a2d6435 100644
--- a/src/main/java/net/mcreator/target/event/PlayerEventHandler.java
+++ b/src/main/java/net/mcreator/target/event/PlayerEventHandler.java
@@ -3,6 +3,7 @@ package net.mcreator.target.event;
import net.mcreator.target.init.TargetModTags;
import net.mcreator.target.network.TargetModVariables;
import net.minecraft.core.BlockPos;
+import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.Level;
@@ -42,27 +43,50 @@ public class PlayerEventHandler {
}
if (event.phase == TickEvent.Phase.END) {
- Level level = player.level();
+ handlePlayerProne(player);
+ handlePlayerSprint(player);
+ }
+ }
- if (player.getBbHeight() <= 1) {
- player.getPersistentData().putDouble("prone", 3);
- }
+ private static void handlePlayerProne(Player player) {
+ Level level = player.level();
- if (player.isShiftKeyDown() && level.getBlockState(BlockPos.containing(player.getX() + 0.7 * player.getLookAngle().x, player.getY() + 0.5, player.getZ() + 0.7 * player.getLookAngle().z)).canOcclude()
- && !level.getBlockState(BlockPos.containing(player.getX() + 0.7 * player.getLookAngle().x, player.getY() + 1.5, player.getZ() + 0.7 * player.getLookAngle().z)).canOcclude()) {
- player.getPersistentData().putDouble("prone", 3);
- }
+ if (player.getBbHeight() <= 1) {
+ player.getPersistentData().putDouble("prone", 3);
+ }
- if (player.getPersistentData().getDouble("prone") > 0) {
- player.getPersistentData().putDouble("prone", (player.getPersistentData().getDouble("prone") - 1));
- }
+ if (player.isShiftKeyDown() && level.getBlockState(BlockPos.containing(player.getX() + 0.7 * player.getLookAngle().x, player.getY() + 0.5, player.getZ() + 0.7 * player.getLookAngle().z)).canOcclude()
+ && !level.getBlockState(BlockPos.containing(player.getX() + 0.7 * player.getLookAngle().x, player.getY() + 1.5, player.getZ() + 0.7 * player.getLookAngle().z)).canOcclude()) {
+ player.getPersistentData().putDouble("prone", 3);
+ }
- boolean flag = !(player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).refresh;
+ if (player.getPersistentData().getDouble("prone") > 0) {
+ player.getPersistentData().putDouble("prone", (player.getPersistentData().getDouble("prone") - 1));
+ }
- player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
- capability.refresh = flag;
- capability.syncPlayerVariables(player);
- });
+ boolean flag = !(player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).refresh;
+
+ player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {
+ capability.refresh = flag;
+ capability.syncPlayerVariables(player);
+ });
+ }
+
+ private static void handlePlayerSprint(Player player) {
+ if (player.getMainHandItem().getOrCreateTag().getDouble("fireanim") > 0) {
+ player.getPersistentData().putDouble("noRun", 20);
+ }
+
+ if (player.isShiftKeyDown() || player.isPassenger() || player.isInWater() || (player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
+ player.getPersistentData().putDouble("noRun", 1);
+ }
+
+ if (player.getPersistentData().getDouble("noRun") > 0) {
+ player.getPersistentData().putDouble("noRun", (player.getPersistentData().getDouble("noRun") - 1));
+ }
+
+ if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
+ player.setSprinting(false);
}
}
}
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 bf242922d..50c899493 100644
--- a/src/main/java/net/mcreator/target/item/gun/AK47Item.java
+++ b/src/main/java/net/mcreator/target/item/gun/AK47Item.java
@@ -96,7 +96,7 @@ public class AK47Item extends GunItem implements GeoItem {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.changefirerate"));
}
- if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("unspringtable") == 0) {
+ if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ak47.run"));
}
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 1eb5408b8..4f5e522bd 100644
--- a/src/main/java/net/mcreator/target/item/gun/Aa12Item.java
+++ b/src/main/java/net/mcreator/target/item/gun/Aa12Item.java
@@ -102,7 +102,7 @@ public class Aa12Item extends GunItem implements GeoItem {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.aa12.changefirerate"));
}
- if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("unspringtable") == 0) {
+ if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.aa12.run"));
}
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 34611fd4e..5b8d38605 100644
--- a/src/main/java/net/mcreator/target/item/gun/Abekiri.java
+++ b/src/main/java/net/mcreator/target/item/gun/Abekiri.java
@@ -90,7 +90,7 @@ public class Abekiri extends GunItem implements GeoItem {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ab.reload"));
}
- if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("unspringtable") == 0) {
+ if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ab.run"));
}
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 5b7148dc9..596784cc0 100644
--- a/src/main/java/net/mcreator/target/item/gun/Devotion.java
+++ b/src/main/java/net/mcreator/target/item/gun/Devotion.java
@@ -89,7 +89,7 @@ public class Devotion extends GunItem implements GeoItem {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.devotion.reload2"));
}
- if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("unspringtable") == 0) {
+ if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.devotion.run"));
}
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 32ee6ff92..593cb5278 100644
--- a/src/main/java/net/mcreator/target/item/gun/Hk416Item.java
+++ b/src/main/java/net/mcreator/target/item/gun/Hk416Item.java
@@ -96,7 +96,7 @@ public class Hk416Item extends GunItem implements GeoItem {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m4.changefirerate"));
}
- if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("unspringtable") == 0) {
+ if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m4.run"));
}
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 9a65af2d1..c0b8b25a4 100644
--- a/src/main/java/net/mcreator/target/item/gun/HuntingRifle.java
+++ b/src/main/java/net/mcreator/target/item/gun/HuntingRifle.java
@@ -84,7 +84,7 @@ public class HuntingRifle extends GunItem implements GeoItem {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.hunting_rifle.reload"));
}
- if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("unspringtable") == 0) {
+ if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.hunting_rifle.run"));
}
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.hunting_rifle.idle"));
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 03d19125c..73a08746d 100644
--- a/src/main/java/net/mcreator/target/item/gun/Kraber.java
+++ b/src/main/java/net/mcreator/target/item/gun/Kraber.java
@@ -96,7 +96,7 @@ public class Kraber extends GunItem implements GeoItem {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.kraber.reload2"));
}
- if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("unspringtable") == 0) {
+ if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.kraber.run"));
}
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 d39f68f01..ed6be07d1 100644
--- a/src/main/java/net/mcreator/target/item/gun/M4Item.java
+++ b/src/main/java/net/mcreator/target/item/gun/M4Item.java
@@ -96,7 +96,7 @@ public class M4Item extends GunItem implements GeoItem {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m4.changefirerate"));
}
- if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("unspringtable") == 0) {
+ if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m4.run"));
}
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 17e7d4c5f..89e683f46 100644
--- a/src/main/java/net/mcreator/target/item/gun/M60Item.java
+++ b/src/main/java/net/mcreator/target/item/gun/M60Item.java
@@ -101,7 +101,7 @@ public class M60Item extends GunItem implements GeoItem {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m60.changefirerate"));
}
- if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("unspringtable") == 0) {
+ if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m60.run"));
}
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 84669b832..72d114ca1 100644
--- a/src/main/java/net/mcreator/target/item/gun/M79Item.java
+++ b/src/main/java/net/mcreator/target/item/gun/M79Item.java
@@ -85,7 +85,7 @@ public class M79Item extends GunItem implements GeoItem {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m79.reload"));
}
- if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("unspringtable") == 0) {
+ if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m79.run"));
}
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 a69ca1d6b..5e9653535 100644
--- a/src/main/java/net/mcreator/target/item/gun/M870Item.java
+++ b/src/main/java/net/mcreator/target/item/gun/M870Item.java
@@ -104,7 +104,7 @@ public class M870Item extends GunItem implements GeoItem {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m870.finish"));
}
- if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("unspringtable") == 0) {
+ if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m870.run"));
}
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 3f971a544..db2cf7c83 100644
--- a/src/main/java/net/mcreator/target/item/gun/M98bItem.java
+++ b/src/main/java/net/mcreator/target/item/gun/M98bItem.java
@@ -92,7 +92,7 @@ public class M98bItem extends GunItem implements GeoItem {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m98b.reload2"));
}
- if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("unspringtable") == 0) {
+ if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m98b.run"));
}
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 09509c53e..dd845f523 100644
--- a/src/main/java/net/mcreator/target/item/gun/MarlinItem.java
+++ b/src/main/java/net/mcreator/target/item/gun/MarlinItem.java
@@ -111,7 +111,7 @@ public class MarlinItem extends GunItem implements GeoItem {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.marlin.finish"));
}
- if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("unspringtable") == 0) {
+ if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.marlin.run"));
}
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 fe3eb83c3..e868e1c8e 100644
--- a/src/main/java/net/mcreator/target/item/gun/Minigun.java
+++ b/src/main/java/net/mcreator/target/item/gun/Minigun.java
@@ -115,7 +115,7 @@ public class Minigun extends GunItem implements GeoItem {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.minigun.draw"));
}
- if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("unspringtable") == 0) {
+ if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.minigun.run"));
}
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.minigun.idle"));
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 9d2cd4bf4..8747da9fd 100644
--- a/src/main/java/net/mcreator/target/item/gun/Mk14Item.java
+++ b/src/main/java/net/mcreator/target/item/gun/Mk14Item.java
@@ -97,7 +97,7 @@ public class Mk14Item extends GunItem implements GeoItem {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.model.changefirerate"));
}
- if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("unspringtable") == 0) {
+ if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.model.run"));
}
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 749c80e8a..a383a25de 100644
--- a/src/main/java/net/mcreator/target/item/gun/RpgItem.java
+++ b/src/main/java/net/mcreator/target/item/gun/RpgItem.java
@@ -86,7 +86,7 @@ public class RpgItem extends GunItem implements GeoItem {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.rpg.reload"));
}
- if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("unspringtable") == 0) {
+ if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.rpg.run"));
}
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 49e4ab0dc..c0ceb7e77 100644
--- a/src/main/java/net/mcreator/target/item/gun/RpkItem.java
+++ b/src/main/java/net/mcreator/target/item/gun/RpkItem.java
@@ -97,7 +97,7 @@ public class RpkItem extends GunItem implements GeoItem {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.changefirerate"));
}
- if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("unspringtable") == 0) {
+ if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ak47.run"));
}
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 d5cfee626..779a13257 100644
--- a/src/main/java/net/mcreator/target/item/gun/SentinelItem.java
+++ b/src/main/java/net/mcreator/target/item/gun/SentinelItem.java
@@ -125,7 +125,7 @@ public class SentinelItem extends GunItem implements GeoItem {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sentinel.charge"));
}
- if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("unspringtable") == 0) {
+ if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.sentinel.run"));
}
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 41340f912..c19761882 100644
--- a/src/main/java/net/mcreator/target/item/gun/SksItem.java
+++ b/src/main/java/net/mcreator/target/item/gun/SksItem.java
@@ -88,7 +88,7 @@ public class SksItem extends GunItem implements GeoItem {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sks.reload2"));
}
- if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("unspringtable") == 0) {
+ if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.sks.run"));
}
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 3c9eb3c7c..9b0c282b0 100644
--- a/src/main/java/net/mcreator/target/item/gun/SvdItem.java
+++ b/src/main/java/net/mcreator/target/item/gun/SvdItem.java
@@ -89,7 +89,7 @@ public class SvdItem extends GunItem implements GeoItem {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.svd.reload2"));
}
- if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("unspringtable") == 0) {
+ if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.svd.run"));
}
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 26e817131..d318643c6 100644
--- a/src/main/java/net/mcreator/target/item/gun/Taser.java
+++ b/src/main/java/net/mcreator/target/item/gun/Taser.java
@@ -87,7 +87,7 @@ public class Taser extends GunItem implements GeoItem {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.taser.reload"));
}
- if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("unspringtable") == 0) {
+ if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.taser.run"));
}
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 486fbb253..cb850c583 100644
--- a/src/main/java/net/mcreator/target/item/gun/Trachelium.java
+++ b/src/main/java/net/mcreator/target/item/gun/Trachelium.java
@@ -89,7 +89,7 @@ public class Trachelium extends GunItem implements GeoItem {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.trachelium.reload"));
}
- if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("unspringtable") == 0) {
+ if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.trachelium.run"));
}
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 1d735bd89..532409567 100644
--- a/src/main/java/net/mcreator/target/item/gun/VectorItem.java
+++ b/src/main/java/net/mcreator/target/item/gun/VectorItem.java
@@ -101,7 +101,7 @@ public class VectorItem extends GunItem implements GeoItem {
return event.setAndContinue(RawAnimation.begin().thenPlay("animation.vec.changefirerate"));
}
- if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("unspringtable") == 0) {
+ if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) {
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.vec.run"));
}
diff --git a/src/main/java/net/mcreator/target/procedures/UnsprintableProcedure.java b/src/main/java/net/mcreator/target/procedures/UnsprintableProcedure.java
deleted file mode 100644
index 673abbc18..000000000
--- a/src/main/java/net/mcreator/target/procedures/UnsprintableProcedure.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package net.mcreator.target.procedures;
-
-import net.mcreator.target.network.TargetModVariables;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.item.ItemStack;
-import net.minecraftforge.event.TickEvent;
-import net.minecraftforge.eventbus.api.Event;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.common.Mod;
-
-import javax.annotation.Nullable;
-
-@Mod.EventBusSubscriber
-public class UnsprintableProcedure {
- @SubscribeEvent
- public static void onPlayerTick(TickEvent.PlayerTickEvent event) {
- if (event.phase == TickEvent.Phase.END) {
- execute(event, event.player);
- }
- }
-
- public static void execute(Entity entity) {
- execute(null, entity);
- }
-
- private static void execute(@Nullable Event event, Entity entity) {
- if (entity == null)
- return;
- if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("fireanim") > 0) {
- entity.getPersistentData().putDouble("unspringtable", 20);
- }
- if (entity.isShiftKeyDown() || entity.isPassenger() || entity.isInWater() || (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
- entity.getPersistentData().putDouble("unspringtable", 1);
- }
- if (entity.getPersistentData().getDouble("unspringtable") > 0) {
- entity.getPersistentData().putDouble("unspringtable", (entity.getPersistentData().getDouble("unspringtable") - 1));
- }
- if ((entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) {
- entity.setSprinting(false);
- }
- }
-}