Side effects may include: Death

kckarnige · Aug 21, 2024 · 18c7c92 · 18c7c92
1 parent 16bad19
commit 18c7c92
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 38 deletions.
diff --git a/src/main/java/com/kckarnige/oye/item/EndCatalyst.java b/src/main/java/com/kckarnige/oye/item/EndCatalyst.java
@@ -1,7 +1,8 @@
 package com.kckarnige.oye.item;
 
-import net.minecraft.block.entity.ChestBlockEntity;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.EquipmentSlot;
+import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.effect.StatusEffectInstance;
 import net.minecraft.entity.effect.StatusEffects;
 import net.minecraft.entity.player.PlayerEntity;
@@ -15,16 +16,31 @@ public EndCatalyst(Settings settings) {
         super(settings);
     }
 
+    @Override
+    public boolean postHit(ItemStack stack, LivingEntity target, LivingEntity attacker) {
+        target.addStatusEffect(new StatusEffectInstance(StatusEffects.WITHER, 100, 2, false, false, true), attacker);
+        target.addStatusEffect(new StatusEffectInstance(StatusEffects.POISON, 100, 2, false, false, true), attacker);
+        target.addStatusEffect(new StatusEffectInstance(StatusEffects.HUNGER, 100, 2, false, false, true), attacker);
+        target.addStatusEffect(new StatusEffectInstance(StatusEffects.WEAKNESS, 100, 2, false, false, true), attacker);
+        target.addStatusEffect(new StatusEffectInstance(StatusEffects.BLINDNESS, 60, 1, false, false, true), attacker);
+        return super.postHit(stack, target, attacker);
+    }
+
     public void inventoryTick(ItemStack nullStack, World world, Entity entity, int slot, boolean selected) {
         if (!world.isClient()) {
             if (entity instanceof PlayerEntity player) {
-
-                if (player.getInventory().main.stream().anyMatch(stack -> stack.isOf(ModItems.VOID_MATTER))) {
-                    player.addStatusEffect(new StatusEffectInstance(StatusEffects.WITHER, 100, 2, true, false, true));
-                    player.addStatusEffect(new StatusEffectInstance(StatusEffects.POISON, 100, 2, true, false, true));
-                    player.addStatusEffect(new StatusEffectInstance(StatusEffects.HUNGER, 100, 2, true, false, true));
-                    player.addStatusEffect(new StatusEffectInstance(StatusEffects.BLINDNESS, 60, 1, true, false, true));
-                    player.addStatusEffect(new StatusEffectInstance(StatusEffects.GLOWING, 60, 1, true, false, true));
+                if (player.getEquippedStack(EquipmentSlot.HEAD).isOf(ModItems.VOID_MATTER)) {
+                    player.addStatusEffect(new StatusEffectInstance(StatusEffects.WITHER, 100, 3, false, false, false));
+                    player.addStatusEffect(new StatusEffectInstance(StatusEffects.POISON, 100, 3, false, false, false));
+                    player.addStatusEffect(new StatusEffectInstance(StatusEffects.HUNGER, 100, 3, false, false, false));
+                    player.addStatusEffect(new StatusEffectInstance(StatusEffects.WEAKNESS, 100, 2, false, false, false));
+                    player.addStatusEffect(new StatusEffectInstance(StatusEffects.NAUSEA, 100, 1, false, false, false));
+                    player.addStatusEffect(new StatusEffectInstance(StatusEffects.STRENGTH, 20, 3, true, false, false));
+                } 
+                else if (player.getEquippedStack(EquipmentSlot.OFFHAND).isOf(ModItems.VOID_MATTER) || player.getInventory().main.stream().anyMatch(stack -> stack.isOf(ModItems.VOID_MATTER))) {
+                    player.addStatusEffect(new StatusEffectInstance(StatusEffects.WITHER, 100, 1, false, false, false));
+                    player.addStatusEffect(new StatusEffectInstance(StatusEffects.POISON, 100, 1, false, false, false));
+                    player.addStatusEffect(new StatusEffectInstance(StatusEffects.HUNGER, 100, 1, false, false, false));
                 }
             }
         }

diff --git a/src/main/java/com/kckarnige/oye/item/ItsInYourHead.java b/src/main/java/com/kckarnige/oye/item/ItsInYourHead.java
@@ -0,0 +1,13 @@
+package com.kckarnige.oye.item;
+
+import net.fabricmc.fabric.api.item.v1.EquipmentSlotProvider;
+import net.minecraft.entity.EquipmentSlot;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.item.ItemStack;
+
+public class ItsInYourHead implements EquipmentSlotProvider {
+    @Override
+    public EquipmentSlot getPreferredEquipmentSlot(LivingEntity entity, ItemStack stack) {
+        return EquipmentSlot.HEAD;
+    }
+}
diff --git a/src/main/java/com/kckarnige/oye/item/ModItems.java b/src/main/java/com/kckarnige/oye/item/ModItems.java
@@ -12,7 +12,7 @@
 
 public class ModItems {
 
-    public static final Item VOID_MATTER = registerItem("end_matter", new EndCatalyst(new Item.Settings()));
+    public static final Item VOID_MATTER = registerItem("end_matter", new EndCatalyst(new Item.Settings().equipmentSlot(new ItsInYourHead())));
 
     private static void addItemToIngredientItemGroup(FabricItemGroupEntries entries) {
         entries.add(VOID_MATTER);

diff --git a/src/main/java/com/kckarnige/oye/mixin/ExampleMixin.java b/src/main/java/com/kckarnige/oye/mixin/ExampleMixin.java
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -25,9 +25,6 @@
 			"com.kckarnige.oye.oyeDataGenerator"
 		]
 	},
-	"mixins": [
-		"oye.mixins.json"
-	],
 	"depends": {
 		"fabricloader": ">=0.15.11",
 		"minecraft": "~1.21",

diff --git a/src/main/resources/oye.mixins.json b/src/main/resources/oye.mixins.json