diff --git a/src/main/java/net/mcreator/target/event/PlayerEventHandler.java b/src/main/java/net/mcreator/target/event/PlayerEventHandler.java index 43a2d6435..3cbd51a3f 100644 --- a/src/main/java/net/mcreator/target/event/PlayerEventHandler.java +++ b/src/main/java/net/mcreator/target/event/PlayerEventHandler.java @@ -3,7 +3,6 @@ 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; @@ -45,6 +44,8 @@ public class PlayerEventHandler { if (event.phase == TickEvent.Phase.END) { handlePlayerProne(player); handlePlayerSprint(player); + handleWeaponLevel(player); + handleWeaponSway(player); } } @@ -89,4 +90,60 @@ public class PlayerEventHandler { player.setSprinting(false); } } + + private static void handleWeaponLevel(Player player) { + ItemStack stack = player.getMainHandItem(); + if (stack.is(TargetModTags.Items.GUN)) { + if (stack.getOrCreateTag().getDouble("level") == 0) { + stack.getOrCreateTag().putDouble("exp2", 20); + } else { + stack.getOrCreateTag().putDouble("exp2", (stack.getOrCreateTag().getDouble("exp1") + stack.getOrCreateTag().getDouble("level") * 500)); + } + if (stack.getOrCreateTag().getDouble("damagetotal") >= stack.getOrCreateTag().getDouble("exp2")) { + stack.getOrCreateTag().putDouble("exp1", (stack.getOrCreateTag().getDouble("exp2"))); + stack.getOrCreateTag().putDouble("level", (stack.getOrCreateTag().getDouble("level") + 1)); + } + stack.getOrCreateTag().putDouble("damagenow", (stack.getOrCreateTag().getDouble("damagetotal") - stack.getOrCreateTag().getDouble("exp1"))); + stack.getOrCreateTag().putDouble("damageneed", (stack.getOrCreateTag().getDouble("exp2") - stack.getOrCreateTag().getDouble("exp1"))); + } + } + + private static void handleWeaponSway(Player player) { + double[] recoilTimer = {0}; + double totalTime = 10; + int sleepTime = 2; + double recoilDuration = totalTime / sleepTime; + + Runnable recoilRunnable = () -> { + while (recoilTimer[0] < recoilDuration) { + if (player == null) + return; + double pose; + if (player.isShiftKeyDown() && player.getBbHeight() >= 1 && player.getPersistentData().getDouble("prone") == 0) { + pose = 0.85; + } else if (player.getPersistentData().getDouble("prone") > 0) { + if (player.getMainHandItem().getOrCreateTag().getDouble("bipod") == 1) { + pose = 0; + } else { + pose = 0.25; + } + } else { + pose = 1; + } + player.getPersistentData().putDouble("time", (player.getPersistentData().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")))); + player.getPersistentData().putDouble("y", (pose * 0.125 * Math.sin(player.getPersistentData().getDouble("time") - 1.585) * (1 - 0.9 * player.getPersistentData().getDouble("zoomtime")))); + + recoilTimer[0]++; + try { + Thread.sleep(sleepTime); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } + }; + + Thread recoilThread = new Thread(recoilRunnable); + recoilThread.start(); + } } diff --git a/src/main/java/net/mcreator/target/procedures/WeaponLevelProcedure.java b/src/main/java/net/mcreator/target/procedures/WeaponLevelProcedure.java deleted file mode 100644 index 708666ac4..000000000 --- a/src/main/java/net/mcreator/target/procedures/WeaponLevelProcedure.java +++ /dev/null @@ -1,47 +0,0 @@ -package net.mcreator.target.procedures; - -import net.minecraft.resources.ResourceLocation; -import net.minecraft.tags.ItemTags; -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 WeaponLevelProcedure { - @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; - ItemStack stack; - stack = (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY); - if (stack.is(ItemTags.create(new ResourceLocation("target:gun")))) { - if (stack.getOrCreateTag().getDouble("level") == 0) { - stack.getOrCreateTag().putDouble("exp2", 20); - } else { - stack.getOrCreateTag().putDouble("exp2", (stack.getOrCreateTag().getDouble("exp1") + stack.getOrCreateTag().getDouble("level") * 500)); - } - if (stack.getOrCreateTag().getDouble("damagetotal") >= stack.getOrCreateTag().getDouble("exp2")) { - stack.getOrCreateTag().putDouble("exp1", (stack.getOrCreateTag().getDouble("exp2"))); - stack.getOrCreateTag().putDouble("level", (stack.getOrCreateTag().getDouble("level") + 1)); - } - stack.getOrCreateTag().putDouble("damagenow", (stack.getOrCreateTag().getDouble("damagetotal") - stack.getOrCreateTag().getDouble("exp1"))); - stack.getOrCreateTag().putDouble("damageneed", (stack.getOrCreateTag().getDouble("exp2") - stack.getOrCreateTag().getDouble("exp1"))); - } - } -} diff --git a/src/main/java/net/mcreator/target/procedures/WeaponSwayProcedure.java b/src/main/java/net/mcreator/target/procedures/WeaponSwayProcedure.java deleted file mode 100644 index 0957be34f..000000000 --- a/src/main/java/net/mcreator/target/procedures/WeaponSwayProcedure.java +++ /dev/null @@ -1,64 +0,0 @@ -package net.mcreator.target.procedures; - -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 WeaponSwayProcedure { - @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) { - - double[] recoilTimer = {0}; - double totalTime = 10; - int sleepTime = 2; - double recoilDuration = totalTime / sleepTime; - Runnable recoilRunnable = () -> { - while (recoilTimer[0] < recoilDuration) { - - if (entity == null) - return; - double pose = 0; - if (entity.isShiftKeyDown() && entity.getBbHeight() >= 1 && entity.getPersistentData().getDouble("prone") == 0) { - pose = 0.85; - } else if (entity.getPersistentData().getDouble("prone") > 0) { - if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("bipod") == 1) { - pose = 0; - } else { - pose = 0.25; - } - } else { - pose = 1; - } - entity.getPersistentData().putDouble("time", (entity.getPersistentData().getDouble("time") + 0.015)); - entity.getPersistentData().putDouble("x", (pose * (-0.008) * Math.sin(1 * entity.getPersistentData().getDouble("time")) * (1 - 0.9 * entity.getPersistentData().getDouble("zoomtime")))); - entity.getPersistentData().putDouble("y", (pose * 0.125 * Math.sin(entity.getPersistentData().getDouble("time") - 1.585) * (1 - 0.9 * entity.getPersistentData().getDouble("zoomtime")))); - - recoilTimer[0]++; - try { - Thread.sleep(sleepTime); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - }; - Thread recoilThread = new Thread(recoilRunnable); - recoilThread.start(); - } -}