diff --git a/gradle.properties b/gradle.properties index 8cb83f7..985e089 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx6G loader_version=0.12.12 # Mod Properties - mod_version = 1.3.2 + mod_version = 1.4.0 maven_group = com.serenas.shitmod archives_base_name = serenas-shitmod diff --git a/src/main/java/net/serenas/shitmod/FabricItem.java b/src/main/java/net/serenas/shitmod/FabricItem.java index b863435..894578b 100644 --- a/src/main/java/net/serenas/shitmod/FabricItem.java +++ b/src/main/java/net/serenas/shitmod/FabricItem.java @@ -20,7 +20,7 @@ public class FabricItem extends Item { @Override public TypedActionResult use(World world, PlayerEntity PlayerEntity, Hand hand) { PlayerEntity.playSound(SoundEvents.BLOCK_AMETHYST_BLOCK_CHIME, 1.0F, 1.0F); - for (int i = 0; i < 10; i++) { + for (int i = 0; i < 50; i++) { world.spawnEntity(new TntEntity(world, PlayerEntity.getX(), PlayerEntity.getY(), PlayerEntity.getZ(), PlayerEntity)); } return new TypedActionResult(ActionResult.SUCCESS, PlayerEntity.getStackInHand(hand)); diff --git a/src/main/java/net/serenas/shitmod/Shitmod.java b/src/main/java/net/serenas/shitmod/Shitmod.java index 91586be..fefb71d 100644 --- a/src/main/java/net/serenas/shitmod/Shitmod.java +++ b/src/main/java/net/serenas/shitmod/Shitmod.java @@ -35,13 +35,15 @@ public class Shitmod implements ModInitializer { public static final Item ORANGE_JUICE = new OrangeJuice(new Item.Settings().group(ItemGroup.FOOD).rarity(Rarity.EPIC).food(new FoodComponent.Builder().hunger(200).saturationModifier(10f).snack().meat().alwaysEdible().statusEffect(new StatusEffectInstance(StatusEffects.REGENERATION, 20*120, 5), 1f).statusEffect(new StatusEffectInstance(StatusEffects.ABSORPTION, 20*120, 20), 1f).statusEffect(new StatusEffectInstance(StatusEffects.FIRE_RESISTANCE, 20*120), 1f).statusEffect(new StatusEffectInstance(StatusEffects.RESISTANCE, 20*120, 3), 1f).statusEffect(new StatusEffectInstance(StatusEffects.SPEED, 20*120, 2), 1f).build())); - public static final ItemGroup ITEM_GROUP = FabricItemGroupBuilder.build( + public static final ItemGroup CHARMS_GROUP = FabricItemGroupBuilder.build( new Identifier("shitmod", "charms"), () -> new ItemStack(Shitmod.KINGSOUL_CHARM)); - public static final Item KINGSOUL_CHARM = new kingsoul(new Item.Settings().group(ItemGroup.MISC)); + public static final Item KINGSOUL_CHARM = new kingsoul(new Item.Settings().group(Shitmod.CHARMS_GROUP).maxDamage(500)); 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)); @Override public void onInitialize() { @@ -65,6 +67,8 @@ public class Shitmod implements ModInitializer { Registry.register(Registry.STATUS_EFFECT, new Identifier("shitmod", "kingsoul_charm"), KINGSOUL_CHARM_EFFECT); + Registry.register(Registry.ITEM, new Identifier("shitmod", "stalwart_shell_charm"), STALWART_SHELL_CHARM); + CustomPortalBuilder.beginPortal() .frameBlock(Blocks.DIAMOND_BLOCK) .lightWithItem(Items.ENDER_EYE) diff --git a/src/main/java/net/serenas/shitmod/kingsoul.java b/src/main/java/net/serenas/shitmod/kingsoul.java index a2a4320..a53a2a0 100644 --- a/src/main/java/net/serenas/shitmod/kingsoul.java +++ b/src/main/java/net/serenas/shitmod/kingsoul.java @@ -1,5 +1,6 @@ package net.serenas.shitmod; +import net.minecraft.entity.EquipmentSlot; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -19,7 +20,7 @@ public class kingsoul extends Item { public TypedActionResult use(World world, PlayerEntity PlayerEntity, Hand hand) { PlayerEntity.getHungerManager().add(1, 1); - + PlayerEntity.getMainHandStack().damage(1,PlayerEntity,e-> e.sendEquipmentBreakStatus(EquipmentSlot.MAINHAND)); return new TypedActionResult(ActionResult.SUCCESS, PlayerEntity.getStackInHand(hand)); } diff --git a/src/main/java/net/serenas/shitmod/stalwartShell.java b/src/main/java/net/serenas/shitmod/stalwartShell.java new file mode 100644 index 0000000..923a248 --- /dev/null +++ b/src/main/java/net/serenas/shitmod/stalwartShell.java @@ -0,0 +1,29 @@ +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.TypedActionResult; +import net.minecraft.world.World; +import net.minecraft.util.Hand; + + +public class stalwartShell extends Item{ + public stalwartShell(Settings settings) { + super(settings); + } + + @Override + public TypedActionResult use(World world, PlayerEntity Playerentity, Hand hand) { + Playerentity.addStatusEffect(new StatusEffectInstance(StatusEffects.RESISTANCE, 20, 5)); + Playerentity.getMainHandStack().damage(1,Playerentity,e-> e.sendEquipmentBreakStatus(EquipmentSlot.MAINHAND)); + return new TypedActionResult(ActionResult.SUCCESS, Playerentity.getStackInHand(hand)); + } + + +} diff --git a/src/main/resources/assets/shitmod/lang/en_us.json b/src/main/resources/assets/shitmod/lang/en_us.json index 98451c2..6238bc6 100644 --- a/src/main/resources/assets/shitmod/lang/en_us.json +++ b/src/main/resources/assets/shitmod/lang/en_us.json @@ -6,5 +6,7 @@ "effect.shitmod.lean": "Lean", "item.shitmod.lean": "Lean", "item.shitmod.orange_juice": "Orange Juice", - "item.shitmod.kingsoul_charm": "Kingsoul Charm" + "item.shitmod.kingsoul_charm": "Kingsoul Charm", + "itemGroup.shitmod.charms": "Charms", + "item.shitmod.stalwart_shell_charm": "Stalwart Shell Charm" } \ No newline at end of file diff --git a/src/main/resources/assets/shitmod/models/item/kingsoul_charm.json b/src/main/resources/assets/shitmod/models/item/kingsoul_charm.json new file mode 100644 index 0000000..8bb0719 --- /dev/null +++ b/src/main/resources/assets/shitmod/models/item/kingsoul_charm.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "shitmod:item/kingsoul_charm" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/shitmod/models/item/stalwart_shell_charm.json b/src/main/resources/assets/shitmod/models/item/stalwart_shell_charm.json new file mode 100644 index 0000000..621a9d3 --- /dev/null +++ b/src/main/resources/assets/shitmod/models/item/stalwart_shell_charm.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "shitmod:item/stalwart_shell_charm" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/shitmod/textures/item/stalwart_shell_charm.png b/src/main/resources/assets/shitmod/textures/item/stalwart_shell_charm.png new file mode 100644 index 0000000..e08a108 Binary files /dev/null and b/src/main/resources/assets/shitmod/textures/item/stalwart_shell_charm.png differ