Add getDisplayName to IIngredientMatcher

CyclopsMC · Mar 21, 2021 · dd29fc0 · dd29fc0
1 parent 4090335
commit dd29fc0
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 1 deletion.
diff --git a/src/main/java/org/cyclops/commoncapabilities/api b/src/main/java/org/cyclops/commoncapabilities/api
diff --git a/src/main/java/org/cyclops/commoncapabilities/ingredient/IngredientMatcherEnergy.java b/src/main/java/org/cyclops/commoncapabilities/ingredient/IngredientMatcherEnergy.java
@@ -1,5 +1,7 @@
 package org.cyclops.commoncapabilities.ingredient;
 
+import net.minecraft.util.text.IFormattableTextComponent;
+import net.minecraft.util.text.TranslationTextComponent;
 import org.cyclops.commoncapabilities.api.ingredient.IIngredientMatcher;
 import org.cyclops.cyclopscore.helper.Helpers;
 import org.cyclops.cyclopscore.helper.L10NHelpers;
@@ -94,6 +96,11 @@ public String localize(Integer instance) {
         return L10NHelpers.localize("recipecomponent.minecraft.energy");
     }
 
+    @Override
+    public IFormattableTextComponent getDisplayName(Integer instance) {
+        return new TranslationTextComponent("recipecomponent.minecraft.energy");
+    }
+
     @Override
     public int compare(Integer o1, Integer o2) {
         return o1 - o2;

diff --git a/src/main/java/org/cyclops/commoncapabilities/ingredient/IngredientMatcherFluidStack.java b/src/main/java/org/cyclops/commoncapabilities/ingredient/IngredientMatcherFluidStack.java
@@ -1,6 +1,7 @@
 package org.cyclops.commoncapabilities.ingredient;
 
 import net.minecraft.fluid.Fluids;
+import net.minecraft.util.text.IFormattableTextComponent;
 import net.minecraftforge.fluids.FluidStack;
 import org.cyclops.commoncapabilities.api.capability.fluidhandler.FluidMatch;
 import org.cyclops.commoncapabilities.api.ingredient.IIngredientMatcher;
@@ -115,6 +116,11 @@ public String localize(FluidStack instance) {
         return instance.getDisplayName().getString();
     }
 
+    @Override
+    public IFormattableTextComponent getDisplayName(FluidStack instance) {
+        return (IFormattableTextComponent) instance.getDisplayName();
+    }
+
     @Override
     public int compare(FluidStack o1, FluidStack o2) {
         if (o1.isEmpty()) {

diff --git a/src/main/java/org/cyclops/commoncapabilities/ingredient/IngredientMatcherItemStack.java b/src/main/java/org/cyclops/commoncapabilities/ingredient/IngredientMatcherItemStack.java
@@ -2,6 +2,7 @@
 
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.text.IFormattableTextComponent;
 import org.cyclops.commoncapabilities.api.capability.itemhandler.ItemMatch;
 import org.cyclops.commoncapabilities.api.ingredient.IIngredientMatcher;
 import org.cyclops.cyclopscore.helper.Helpers;
@@ -102,6 +103,11 @@ public String localize(ItemStack instance) {
         return instance.getDisplayName().getString();
     }
 
+    @Override
+    public IFormattableTextComponent getDisplayName(ItemStack instance) {
+        return (IFormattableTextComponent) instance.getDisplayName();
+    }
+
     @Override
     public int compare(ItemStack o1, ItemStack o2) {
         if (o1.isEmpty()) {