Merge pull request #131 from Gu-ZT/CuredItem

诅咒金相关物品给玩家带来的debuff进行创造模式判断
Anvil-Dev · Apr 1, 2024 · 17a4149 · 17a4149
2 parents 8a4f5bd + 12e2976
commit 17a4149
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 28 deletions.
diff --git a/src/main/java/dev/dubhe/anvilcraft/item/Cured.java b/src/main/java/dev/dubhe/anvilcraft/item/Cured.java
@@ -0,0 +1,27 @@
+package dev.dubhe.anvilcraft.item;
+
+import dev.dubhe.anvilcraft.init.ModItems;
+import net.minecraft.world.effect.MobEffectInstance;
+import net.minecraft.world.effect.MobEffects;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.Level;
+
+public interface Cured {
+    default void inventoryTick(ItemStack stack, Level level, Entity entity, int slotId, boolean isSelected) {
+        if (!(entity instanceof Player player)) return;
+        if (player.getAbilities().instabuild) return;
+        MobEffectInstance weakness = new MobEffectInstance(MobEffects.WEAKNESS, 200, 1, false, true);
+        MobEffectInstance slowness = new MobEffectInstance(MobEffects.MOVEMENT_SLOWDOWN, 200, 1, false, true);
+        MobEffectInstance hungry = new MobEffectInstance(MobEffects.HUNGER, 200, 1, false, true);
+        player.addEffect((weakness));
+        int curedNumber = player.getInventory().countItem(ModItems.CURSED_GOLD_INGOT) + player.getInventory().countItem(ModItems.CURSED_GOLD_NUGGET) + player.getInventory().countItem(ModItems.CURSED_GOLD_BLOCK);
+        if (curedNumber > 8) {
+            player.addEffect((slowness));
+        }
+        if (curedNumber > 64) {
+            player.addEffect((hungry));
+        }
+    }
+}
diff --git a/src/main/java/dev/dubhe/anvilcraft/item/CuredBlockItem.java b/src/main/java/dev/dubhe/anvilcraft/item/CuredBlockItem.java
@@ -10,7 +10,7 @@
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
 
-public class CuredBlockItem extends BlockItem {
+public class CuredBlockItem extends BlockItem implements Cured {
 
     public CuredBlockItem(Block block, Properties properties) {
         super(block, properties);
@@ -19,18 +19,6 @@ public CuredBlockItem(Block block, Properties properties) {
     @Override
     public void inventoryTick(ItemStack stack, Level level, Entity entity, int slotId, boolean isSelected) {
         super.inventoryTick(stack, level, entity, slotId, isSelected);
-        if (entity instanceof Player player) {
-            MobEffectInstance weakness = new MobEffectInstance(MobEffects.WEAKNESS, 200, 1, false, true);
-            MobEffectInstance slowness = new MobEffectInstance(MobEffects.MOVEMENT_SLOWDOWN, 200, 1, false, true);
-            MobEffectInstance hungry = new MobEffectInstance(MobEffects.HUNGER, 200, 1, false, true);
-            player.addEffect((weakness));
-            int curedNumber = player.getInventory().countItem(ModItems.CURSED_GOLD_INGOT) + player.getInventory().countItem(ModItems.CURSED_GOLD_NUGGET) + player.getInventory().countItem(ModItems.CURSED_GOLD_BLOCK);
-            if (curedNumber>8){
-                player.addEffect((slowness));
-            }
-            if (curedNumber>64){
-                player.addEffect((hungry));
-            }
-        }
+        Cured.super.inventoryTick(stack, level, entity, slotId, isSelected);
     }
 }
diff --git a/src/main/java/dev/dubhe/anvilcraft/item/CuredItem.java b/src/main/java/dev/dubhe/anvilcraft/item/CuredItem.java
@@ -9,26 +9,14 @@
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
 
-public class CuredItem extends Item {
+public class CuredItem extends Item implements Cured {
     public CuredItem(Properties properties) {
         super(properties);
     }
 
     @Override
     public void inventoryTick(ItemStack stack, Level level, Entity entity, int slotId, boolean isSelected) {
         super.inventoryTick(stack, level, entity, slotId, isSelected);
-        if (entity instanceof Player player) {
-            MobEffectInstance weakness = new MobEffectInstance(MobEffects.WEAKNESS, 200, 1, false, true);
-            MobEffectInstance slowness = new MobEffectInstance(MobEffects.MOVEMENT_SLOWDOWN, 200, 1, false, true);
-            MobEffectInstance hungry = new MobEffectInstance(MobEffects.HUNGER, 200, 1, false, true);
-            player.addEffect((weakness));
-            int curedNumber = player.getInventory().countItem(ModItems.CURSED_GOLD_INGOT) + player.getInventory().countItem(ModItems.CURSED_GOLD_NUGGET) + player.getInventory().countItem(ModItems.CURSED_GOLD_BLOCK);
-            if (curedNumber>8){
-                player.addEffect((slowness));
-            }
-            if (curedNumber>64){
-                player.addEffect((hungry));
-            }
-        }
+        Cured.super.inventoryTick(stack, level, entity, slotId, isSelected);
     }
 }