Correct cheat item stacks of StatusEffectEmiStack

Prismwork · Nov 14, 2022 · 8e18345 · 8e18345
1 parent 0601ab4
commit 8e18345
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 23 deletions.
diff --git a/src/main/java/io/github/pkstdev/emiffect/EMIffectPlugin.java b/src/main/java/io/github/pkstdev/emiffect/EMIffectPlugin.java
@@ -15,13 +15,10 @@
 import net.minecraft.item.Items;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.registry.Registry;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 @Entrypoint("emi") // For automatically registering the entrypoint
 public class EMIffectPlugin implements EmiPlugin {
     public static final String MOD_ID = "emiffect";
-    public static final Logger LOGGER = LoggerFactory.getLogger("Emiffect");
     public static final Identifier CATEGORY_ICON = new Identifier(MOD_ID, "textures/gui/emi/icon.png");
     public static final EmiRecipeCategory CATEGORY
             = new EmiRecipeCategory(new Identifier(MOD_ID, "status_effect_info"), new EmiTexture(CATEGORY_ICON, 0, 0, 16, 16, 16, 16, 16, 16));

diff --git a/src/main/java/io/github/pkstdev/emiffect/mixin/package-info.java b/src/main/java/io/github/pkstdev/emiffect/mixin/package-info.java
diff --git a/src/main/java/io/github/pkstdev/emiffect/util/package-info.java b/src/main/java/io/github/pkstdev/emiffect/util/package-info.java
@@ -1 +1,4 @@
+/**
+ * Utilities used in EMIffect.
+ */
 package io.github.pkstdev.emiffect.util;
diff --git a/src/main/java/io/github/pkstdev/emiffect/util/stack/StatusEffectEmiStack.java b/src/main/java/io/github/pkstdev/emiffect/util/stack/StatusEffectEmiStack.java
@@ -12,14 +12,19 @@
 import net.minecraft.client.texture.StatusEffectSpriteManager;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.effect.StatusEffect;
+import net.minecraft.entity.effect.StatusEffectInstance;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.Items;
 import net.minecraft.nbt.NbtCompound;
+import net.minecraft.potion.PotionUtil;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.registry.Registry;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 public class StatusEffectEmiStack extends EmiStack {
@@ -124,4 +129,14 @@ public Class<? extends StatusEffect> getType() {
             return getValue().getClass();
         }
     }
+
+    @Override
+    public ItemStack getItemStack() {
+        ItemStack stack = super.getItemStack();
+        if (effect != null) {
+            stack = PotionUtil.setCustomPotionEffects(Items.POTION.getDefaultStack(),
+                    Collections.singletonList(new StatusEffectInstance(effect, 600)));
+        }
+        return stack;
+    }
 }
diff --git a/src/main/resources/emiffect.mixins.json b/src/main/resources/emiffect.mixins.json
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -21,9 +21,6 @@
     "emi": [
     ]
   },
-  "mixins": [
-    "emiffect.mixins.json"
-  ],
 
   "depends": {
     "fabricloader": ">=0.14.9",