From 8ab4e6ba9058482e26a993676263fd65ff39d9be Mon Sep 17 00:00:00 2001 From: Sunskimmer822 <92886026+Sunskimmer822@users.noreply.github.com> Date: Fri, 4 Mar 2022 13:45:15 -0800 Subject: [PATCH] fix notch delay --- src/main/java/net/serenas/shitmod/fragileHeartCharm.java | 8 -------- .../java/net/serenas/shitmod/fragileStrengthCharm.java | 7 ------- src/main/java/net/serenas/shitmod/kingsoul.java | 7 ------- src/main/java/net/serenas/shitmod/stalwartShell.java | 8 -------- .../java/net/serenas/shitmod/totemOfEquivalency.java | 7 +++++++ .../java/net/serenas/shitmod/unbreakableHeartCharm.java | 9 +-------- .../net/serenas/shitmod/unbreakableStrengthCharm.java | 7 ------- 7 files changed, 8 insertions(+), 45 deletions(-) diff --git a/src/main/java/net/serenas/shitmod/fragileHeartCharm.java b/src/main/java/net/serenas/shitmod/fragileHeartCharm.java index e95dcbf..d0df6d5 100644 --- a/src/main/java/net/serenas/shitmod/fragileHeartCharm.java +++ b/src/main/java/net/serenas/shitmod/fragileHeartCharm.java @@ -8,9 +8,6 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.TypedActionResult; import net.minecraft.world.World; - -import java.util.concurrent.TimeUnit; - import net.minecraft.entity.EquipmentSlot; import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.entity.effect.StatusEffects; @@ -31,11 +28,6 @@ public class fragileHeartCharm extends Item { Playerentity.sendMessage(new LiteralText("You have " + availableSlots + "charm notches left."), false); Playerentity.addStatusEffect(new StatusEffectInstance(StatusEffects.HEALTH_BOOST, 20*1000000, 2)); Playerentity.getMainHandStack().damage(50,Playerentity,e-> e.sendEquipmentBreakStatus(EquipmentSlot.MAINHAND)); - try { - TimeUnit.SECONDS.sleep(100); - } catch (InterruptedException e1) { - e1.printStackTrace(); - } availableSlots++; } else if (availableSlots < 1) { diff --git a/src/main/java/net/serenas/shitmod/fragileStrengthCharm.java b/src/main/java/net/serenas/shitmod/fragileStrengthCharm.java index d7e58f7..b69611f 100644 --- a/src/main/java/net/serenas/shitmod/fragileStrengthCharm.java +++ b/src/main/java/net/serenas/shitmod/fragileStrengthCharm.java @@ -1,7 +1,5 @@ package net.serenas.shitmod; -import java.util.concurrent.TimeUnit; - import net.minecraft.entity.EquipmentSlot; import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.entity.effect.StatusEffects; @@ -29,11 +27,6 @@ public class fragileStrengthCharm extends Item{ PlayerEntity.sendMessage(new LiteralText("You have " + availableSlots + "charm notches left."), false); PlayerEntity.addStatusEffect(new StatusEffectInstance(StatusEffects.STRENGTH, 20*1000000, 2)); PlayerEntity.getMainHandStack().damage(50,PlayerEntity,e-> e.sendEquipmentBreakStatus(EquipmentSlot.MAINHAND)); - try { - TimeUnit.SECONDS.sleep(5); - } catch (InterruptedException e1) { - e1.printStackTrace(); - } availableSlots++; } else if (availableSlots < 1) { diff --git a/src/main/java/net/serenas/shitmod/kingsoul.java b/src/main/java/net/serenas/shitmod/kingsoul.java index 604a64f..b9c75f8 100644 --- a/src/main/java/net/serenas/shitmod/kingsoul.java +++ b/src/main/java/net/serenas/shitmod/kingsoul.java @@ -1,7 +1,5 @@ package net.serenas.shitmod; -import java.util.concurrent.TimeUnit; - import net.minecraft.entity.EquipmentSlot; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; @@ -28,11 +26,6 @@ public class kingsoul extends Item { PlayerEntity.sendMessage(new LiteralText("You have " + availableSlots + "charm notches left."), false); PlayerEntity.getHungerManager().add(1, 1); PlayerEntity.getMainHandStack().damage(1,PlayerEntity,e-> e.sendEquipmentBreakStatus(EquipmentSlot.MAINHAND)); - try { - TimeUnit.SECONDS.sleep(5); - } catch (InterruptedException e1) { - e1.printStackTrace(); - } availableSlots++; } else if (availableSlots < 1) { diff --git a/src/main/java/net/serenas/shitmod/stalwartShell.java b/src/main/java/net/serenas/shitmod/stalwartShell.java index 8e49415..6d5ee0c 100644 --- a/src/main/java/net/serenas/shitmod/stalwartShell.java +++ b/src/main/java/net/serenas/shitmod/stalwartShell.java @@ -1,8 +1,5 @@ package net.serenas.shitmod; - -import java.util.concurrent.TimeUnit; - import net.minecraft.entity.EquipmentSlot; import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.entity.effect.StatusEffects; @@ -30,11 +27,6 @@ public class stalwartShell extends Item{ PlayerEntity.sendMessage(new LiteralText("You have " + availableSlots + "charm notches left."), false); PlayerEntity.addStatusEffect(new StatusEffectInstance(StatusEffects.RESISTANCE, 20, 5)); PlayerEntity.getMainHandStack().damage(1,PlayerEntity,e-> e.sendEquipmentBreakStatus(EquipmentSlot.MAINHAND)); - try { - TimeUnit.SECONDS.sleep(15); - } catch (InterruptedException e1) { - e1.printStackTrace(); - } availableSlots++; } else if (availableSlots < 1) { diff --git a/src/main/java/net/serenas/shitmod/totemOfEquivalency.java b/src/main/java/net/serenas/shitmod/totemOfEquivalency.java index 34d37c8..8618765 100644 --- a/src/main/java/net/serenas/shitmod/totemOfEquivalency.java +++ b/src/main/java/net/serenas/shitmod/totemOfEquivalency.java @@ -1,5 +1,7 @@ package net.serenas.shitmod; +import java.util.concurrent.TimeUnit; + import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -17,6 +19,11 @@ public class totemOfEquivalency extends Item { @Override public TypedActionResult use(World World, PlayerEntity PlayerEntity, Hand Hand) { PlayerEntity.kill(); + try { + TimeUnit.SECONDS.sleep(10); + } catch (InterruptedException e1) { + e1.printStackTrace(); + } return new TypedActionResult(ActionResult.SUCCESS, PlayerEntity.getStackInHand(Hand)); } } diff --git a/src/main/java/net/serenas/shitmod/unbreakableHeartCharm.java b/src/main/java/net/serenas/shitmod/unbreakableHeartCharm.java index 680a498..d8aa3a7 100644 --- a/src/main/java/net/serenas/shitmod/unbreakableHeartCharm.java +++ b/src/main/java/net/serenas/shitmod/unbreakableHeartCharm.java @@ -1,7 +1,5 @@ package net.serenas.shitmod; -import java.util.concurrent.TimeUnit; - import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.entity.effect.StatusEffects; import net.minecraft.entity.player.PlayerEntity; @@ -26,13 +24,8 @@ public class unbreakableHeartCharm extends Item { if (availableSlots > 0) { availableSlots--; - PlayerEntity.sendMessage(new LiteralText("You have " + availableSlots + "charm notches left."), false); + PlayerEntity.sendMessage(new LiteralText("You have " + availableSlots + " charm notches left."), false); PlayerEntity.addStatusEffect(new StatusEffectInstance(StatusEffects.HEALTH_BOOST, 20*1000000, 4)); - try { - TimeUnit.SECONDS.sleep(5); - } catch (InterruptedException e1) { - e1.printStackTrace(); - } availableSlots++; } else if (availableSlots < 1) { diff --git a/src/main/java/net/serenas/shitmod/unbreakableStrengthCharm.java b/src/main/java/net/serenas/shitmod/unbreakableStrengthCharm.java index 2dafb34..37bd80a 100644 --- a/src/main/java/net/serenas/shitmod/unbreakableStrengthCharm.java +++ b/src/main/java/net/serenas/shitmod/unbreakableStrengthCharm.java @@ -1,7 +1,5 @@ package net.serenas.shitmod; -import java.util.concurrent.TimeUnit; - import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.entity.effect.StatusEffects; import net.minecraft.entity.player.PlayerEntity; @@ -28,11 +26,6 @@ public class unbreakableStrengthCharm extends Item { availableSlots--; PlayerEntity.sendMessage(new LiteralText("You have " + availableSlots + "charm notches left."), false); PlayerEntity.addStatusEffect(new StatusEffectInstance(StatusEffects.STRENGTH, 20*1000000, 3)); - try { - TimeUnit.SECONDS.sleep(5); - } catch (InterruptedException e1) { - e1.printStackTrace(); - } availableSlots++; } else if (availableSlots < 1) {