Merge branch 'master' into 1.17

# Conflicts:
#	src/main/java/carpet/script/utils/SnoopyCommandSource.java
#	src/main/java/carpet/utils/WoolTool.java
This commit is contained in:
gnembon committed 2021-05-18 21:23:15 -03:00
commit b80b555781
9 files changed
+147 -12

No files matched your search

@@ -7,5 +7,9 @@ import java.util.List;
public interface IngredientInterface
{
/**
* Gets all the stacks of the ingredients for a given item recipe. Also used for {@link carpet.helpers.HopperCounter#guessColor}
* to guess the colour of an item to display it prettily
*/
List<Collection<ItemStack>> getRecipeStacks();
}
@@ -1,5 +1,6 @@
package carpet.fakes;
import net.minecraft.item.Item;
import net.minecraft.recipe.Recipe;
import net.minecraft.recipe.RecipeType;
import net.minecraft.util.Identifier;
@@ -8,5 +9,9 @@ import java.util.List;
public interface RecipeManagerInterface
{
/**
* Gets all the recipes for a given item. Also used for {@link carpet.helpers.HopperCounter#guessColor} to guess the
* colour of an item to display it prettily
*/
List<Recipe<?>> getAllMatching(RecipeType type, Identifier output);
}