Skip to content

Commit e423cdd

Browse files
committed
Update ArcaneAnvilRecipeMaker.java
1 parent 4435861 commit e423cdd

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

src/main/java/io/redspace/ironsspellbooks/jei/ArcaneAnvilRecipeMaker.java

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,14 @@
66
import io.redspace.ironsspellbooks.api.util.Utils;
77
import io.redspace.ironsspellbooks.capabilities.magic.UpgradeData;
88
import io.redspace.ironsspellbooks.item.UpgradeOrbItem;
9+
import io.redspace.ironsspellbooks.registries.CreativeTabRegistry;
910
import io.redspace.ironsspellbooks.registries.ItemRegistry;
1011
import io.redspace.ironsspellbooks.util.UpgradeUtils;
1112
import mezz.jei.api.recipe.vanilla.IVanillaRecipeFactory;
1213
import mezz.jei.api.runtime.IIngredientManager;
1314
import net.minecraft.core.Registry;
15+
import net.minecraft.world.item.CreativeModeTabs;
16+
import net.minecraft.world.item.Item;
1417
import net.minecraft.world.item.ItemStack;
1518
import net.minecraft.world.item.SwordItem;
1619
import net.minecraftforge.registries.ForgeRegistries;
@@ -50,20 +53,24 @@ private static Stream<ArcaneAnvilRecipe> getScrollRecipes(IVanillaRecipeFactory
5053
}
5154

5255
private static Stream<ArcaneAnvilRecipe> getImbueRecipes(IVanillaRecipeFactory vanillaRecipeFactory, IIngredientManager ingredientManager) {
53-
return ForgeRegistries.ITEMS.getValues().stream()
54-
.filter(item -> Utils.canImbue(new ItemStack(item)) && item.getItemCategory() != null)
56+
return getVisibleItems().stream()
57+
.filter(item -> Utils.canImbue(new ItemStack(item)))
5558
.map(item -> new ArcaneAnvilRecipe(new ItemStack(item), (AbstractSpell) null));
5659
}
5760

5861
private static Stream<ArcaneAnvilRecipe> getUpgradeRecipes(IVanillaRecipeFactory vanillaRecipeFactory, IIngredientManager ingredientManager) {
5962
return ForgeRegistries.ITEMS.getValues().stream()
6063
.filter(item -> item instanceof UpgradeOrbItem)
6164
.flatMap(upgradeOrb ->
62-
ForgeRegistries.ITEMS.getValues().stream()
63-
.filter(item -> Utils.canBeUpgraded(new ItemStack(item)) && item.getItemCategory() != null)
65+
getVisibleItems().stream()
66+
.filter(item -> Utils.canBeUpgraded(new ItemStack(item)))
6467
.map(item -> new ArcaneAnvilRecipe(new ItemStack(item), List.of(new ItemStack(upgradeOrb)))));
6568
}
6669

70+
public static List<Item> getVisibleItems() {
71+
return ForgeRegistries.ITEMS.getValues().stream().filter(item -> CreativeModeTabs.allTabs().stream().anyMatch(tab -> tab.contains(new ItemStack(item)))).toList();
72+
}
73+
6774
// private static ArcaneAnvilRecipe enumerateScrollCombinations(AbstractSpell spell) {
6875
// var scrollStack = new ItemStack(ItemRegistry.SCROLL.get());
6976
//

0 commit comments

Comments
 (0)