diff --git a/src/main/java/net/serenas/shitmod/Shitmod.java b/src/main/java/net/serenas/shitmod/Shitmod.java index fefb71d..ffed51e 100644 --- a/src/main/java/net/serenas/shitmod/Shitmod.java +++ b/src/main/java/net/serenas/shitmod/Shitmod.java @@ -39,11 +39,19 @@ public class Shitmod implements ModInitializer { new Identifier("shitmod", "charms"), () -> new ItemStack(Shitmod.KINGSOUL_CHARM)); - public static final Item KINGSOUL_CHARM = new kingsoul(new Item.Settings().group(Shitmod.CHARMS_GROUP).maxDamage(500)); + public static final Item KINGSOUL_CHARM = new kingsoul(new Item.Settings().group(Shitmod.CHARMS_GROUP).maxDamage(500).fireproof()); public static final StatusEffect KINGSOUL_CHARM_EFFECT = new kingsoulEffect(); - public static final Item STALWART_SHELL_CHARM = new stalwartShell(new Item.Settings().group(Shitmod.CHARMS_GROUP).maxDamage(500)); + public static final Item STALWART_SHELL_CHARM = new stalwartShell(new Item.Settings().group(Shitmod.CHARMS_GROUP).maxDamage(500).fireproof()); + + public static final Item FRAGILE_HEART_CHARM = new fragileHeartCharm(new Item.Settings().group(Shitmod.CHARMS_GROUP).maxDamage(100).fireproof()); + + public static final Item UNBREAKABLE_HEART_CHARM = new unbreakableHeartCharm(new Item.Settings().group(Shitmod.CHARMS_GROUP).fireproof().maxCount(1)); + + public static final Item FRAGILE_STRENGTH_CHARM = new fragileStrengthCharm(new Item.Settings().group(Shitmod.CHARMS_GROUP).maxDamage(100).fireproof()); + + public static final Item UNBREAKABLE_STRENGTH_CHARM = new unbreakableStrengthCharm(new Item.Settings().group(Shitmod.CHARMS_GROUP).fireproof().maxCount(1)); @Override public void onInitialize() { @@ -69,6 +77,14 @@ public class Shitmod implements ModInitializer { Registry.register(Registry.ITEM, new Identifier("shitmod", "stalwart_shell_charm"), STALWART_SHELL_CHARM); + Registry.register(Registry.ITEM, new Identifier("shitmod", "fragile_heart_charm"), FRAGILE_HEART_CHARM); + + Registry.register(Registry.ITEM, new Identifier("shitmod", "unbreakable_heart_charm"), UNBREAKABLE_HEART_CHARM); + + Registry.register(Registry.ITEM, new Identifier("shitmod", "fragile_strength_charm"), FRAGILE_STRENGTH_CHARM); + + Registry.register(Registry.ITEM, new Identifier("shitmod", "unbreakable_strength_charm"), UNBREAKABLE_STRENGTH_CHARM); + CustomPortalBuilder.beginPortal() .frameBlock(Blocks.DIAMOND_BLOCK) .lightWithItem(Items.ENDER_EYE) diff --git a/src/main/java/net/serenas/shitmod/fragileHeartCharm.java b/src/main/java/net/serenas/shitmod/fragileHeartCharm.java new file mode 100644 index 0000000..dea90e7 --- /dev/null +++ b/src/main/java/net/serenas/shitmod/fragileHeartCharm.java @@ -0,0 +1,26 @@ +package net.serenas.shitmod; + +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ActionResult; +import net.minecraft.util.Hand; +import net.minecraft.util.TypedActionResult; +import net.minecraft.world.World; +import net.minecraft.entity.EquipmentSlot; +import net.minecraft.entity.effect.StatusEffectInstance; +import net.minecraft.entity.effect.StatusEffects; + +public class fragileHeartCharm extends Item { + + public fragileHeartCharm(Settings settings) { + super(settings); + } + + @Override + public TypedActionResult use(World World, PlayerEntity Playerentity, Hand Hand) { + Playerentity.addStatusEffect(new StatusEffectInstance(StatusEffects.HEALTH_BOOST, 20*1000000, 3)); + Playerentity.getMainHandStack().damage(50,Playerentity,e-> e.sendEquipmentBreakStatus(EquipmentSlot.MAINHAND)); + return new TypedActionResult(ActionResult.SUCCESS, Playerentity.getStackInHand(Hand)); + } +} diff --git a/src/main/java/net/serenas/shitmod/fragileStrengthCharm.java b/src/main/java/net/serenas/shitmod/fragileStrengthCharm.java new file mode 100644 index 0000000..9c50941 --- /dev/null +++ b/src/main/java/net/serenas/shitmod/fragileStrengthCharm.java @@ -0,0 +1,26 @@ +package net.serenas.shitmod; + +import net.minecraft.entity.EquipmentSlot; +import net.minecraft.entity.effect.StatusEffectInstance; +import net.minecraft.entity.effect.StatusEffects; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ActionResult; +import net.minecraft.util.Hand; +import net.minecraft.util.TypedActionResult; +import net.minecraft.world.World; + +public class fragileStrengthCharm extends Item{ + + public fragileStrengthCharm(Settings settings) { + super(settings); + } + @Override + public TypedActionResult use(World world, PlayerEntity Playerentity, Hand Hand) { + Playerentity.addStatusEffect(new StatusEffectInstance(StatusEffects.STRENGTH, 20*1000000, 2)); + Playerentity.getMainHandStack().damage(50,Playerentity,e-> e.sendEquipmentBreakStatus(EquipmentSlot.MAINHAND)); + 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 new file mode 100644 index 0000000..f916096 --- /dev/null +++ b/src/main/java/net/serenas/shitmod/unbreakableHeartCharm.java @@ -0,0 +1,23 @@ +package net.serenas.shitmod; + +import net.minecraft.entity.effect.StatusEffectInstance; +import net.minecraft.entity.effect.StatusEffects; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ActionResult; +import net.minecraft.util.Hand; +import net.minecraft.util.TypedActionResult; +import net.minecraft.world.World; + +public class unbreakableHeartCharm extends Item { + + public unbreakableHeartCharm(Settings settings) { + super(settings); + } + @Override + public TypedActionResult use(World world, PlayerEntity Playerentity, Hand Hand) { + Playerentity.addStatusEffect(new StatusEffectInstance(StatusEffects.HEALTH_BOOST, 20*1000000, 4)); + return new TypedActionResult(ActionResult.SUCCESS, Playerentity.getStackInHand(Hand)); + } +} \ No newline at end of file diff --git a/src/main/java/net/serenas/shitmod/unbreakableStrengthCharm.java b/src/main/java/net/serenas/shitmod/unbreakableStrengthCharm.java new file mode 100644 index 0000000..a4df55f --- /dev/null +++ b/src/main/java/net/serenas/shitmod/unbreakableStrengthCharm.java @@ -0,0 +1,23 @@ +package net.serenas.shitmod; + +import net.minecraft.entity.effect.StatusEffectInstance; +import net.minecraft.entity.effect.StatusEffects; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ActionResult; +import net.minecraft.util.Hand; +import net.minecraft.util.TypedActionResult; +import net.minecraft.world.World; + +public class unbreakableStrengthCharm extends Item { + + public unbreakableStrengthCharm(Settings settings) { + super(settings); + } + @Override + public TypedActionResult use(World world, PlayerEntity Playerentity, Hand Hand) { + Playerentity.addStatusEffect(new StatusEffectInstance(StatusEffects.STRENGTH, 20*1000000, 3)); + return new TypedActionResult(ActionResult.SUCCESS, Playerentity.getStackInHand(Hand)); + } +} diff --git a/src/main/resources/assets/shitmod/models/item/fragile_heart_charm.json b/src/main/resources/assets/shitmod/models/item/fragile_heart_charm.json new file mode 100644 index 0000000..f54b44d --- /dev/null +++ b/src/main/resources/assets/shitmod/models/item/fragile_heart_charm.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "shitmod:item/fragile_heart_charm" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/shitmod/models/item/fragile_strength_charm.json b/src/main/resources/assets/shitmod/models/item/fragile_strength_charm.json new file mode 100644 index 0000000..51bee85 --- /dev/null +++ b/src/main/resources/assets/shitmod/models/item/fragile_strength_charm.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "shitmod:item/fragile_strength_charm" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/shitmod/models/item/unbreakable_heart_charm.json b/src/main/resources/assets/shitmod/models/item/unbreakable_heart_charm.json new file mode 100644 index 0000000..fa4852b --- /dev/null +++ b/src/main/resources/assets/shitmod/models/item/unbreakable_heart_charm.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "shitmod:item/unbreakable_heart_charm" + } +} diff --git a/src/main/resources/assets/shitmod/models/item/unbreakable_strength_charm.json b/src/main/resources/assets/shitmod/models/item/unbreakable_strength_charm.json new file mode 100644 index 0000000..82750fd --- /dev/null +++ b/src/main/resources/assets/shitmod/models/item/unbreakable_strength_charm.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "shitmod:item/unbreakable_strength_charm" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/shitmod/textures/item/fragile_heart_charm.png b/src/main/resources/assets/shitmod/textures/item/fragile_heart_charm.png new file mode 100644 index 0000000..9c3c3ab Binary files /dev/null and b/src/main/resources/assets/shitmod/textures/item/fragile_heart_charm.png differ diff --git a/src/main/resources/assets/shitmod/textures/item/fragile_strength_charm.png b/src/main/resources/assets/shitmod/textures/item/fragile_strength_charm.png new file mode 100644 index 0000000..7226374 Binary files /dev/null and b/src/main/resources/assets/shitmod/textures/item/fragile_strength_charm.png differ diff --git a/src/main/resources/assets/shitmod/textures/item/unbreakable_heart_charm.png b/src/main/resources/assets/shitmod/textures/item/unbreakable_heart_charm.png new file mode 100644 index 0000000..f2dddd0 Binary files /dev/null and b/src/main/resources/assets/shitmod/textures/item/unbreakable_heart_charm.png differ diff --git a/src/main/resources/assets/shitmod/textures/item/unbreakable_strength_charm.png b/src/main/resources/assets/shitmod/textures/item/unbreakable_strength_charm.png new file mode 100644 index 0000000..1b04e46 Binary files /dev/null and b/src/main/resources/assets/shitmod/textures/item/unbreakable_strength_charm.png differ