upstream/BloodMagic
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/BloodMagic.git synced 2026-11-12 16:27:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix irrelevant Botania flowers show up in NEI (#16)

Browse Source
This commit is contained in:
miozune authored and GitHub committed 2022-02-25 12:18:14 +01:00
1 parent b096ac46bd
commit 77df089900
6 files changed
+9 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

dependencies.gradle
+1 -1
View File
@@ -10,7 +10,7 @@ dependencies {
compileOnly("com.github.GTNewHorizons:ForgeMultipart:1.2.7:dev") {
transitive = false
}
compileOnly("com.github.GTNewHorizons:NotEnoughItems:2.1.22-GTNH:dev") {
compileOnly("com.github.GTNewHorizons:NotEnoughItems:2.2.7-GTNH:dev") {
transitive = false
}
compileOnly("com.github.GTNewHorizons:Chisel:2.10.6-GTNH:api") {
src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIAlchemyRecipeHandler.java
+2 -2
View File
@@ -111,7 +111,7 @@ public class NEIAlchemyRecipeHandler extends TemplateRecipeHandler {
public void loadCraftingRecipes(ItemStack result) {
for (AlchemyRecipe recipe : AlchemyRecipeRegistry.recipes) {
if (recipe == null) continue;
if (NEIServerUtils.areStacksSameTypeCrafting(result, recipe.getResult())) {
if (NEIServerUtils.areStacksSameTypeCraftingWithNBT(result, recipe.getResult())) {
arecipes.add(new CachedAlchemyRecipe(recipe));
}
}
@@ -131,7 +131,7 @@ public class NEIAlchemyRecipeHandler extends TemplateRecipeHandler {
if (recipe == null) continue;
ItemStack[] stacks = recipe.getRecipe();
for (ItemStack stack : stacks) {
if (NEIServerUtils.areStacksSameTypeCrafting(stack, ingredient)) {
if (NEIServerUtils.areStacksSameTypeCraftingWithNBT(stack, ingredient)) {
arecipes.add(new CachedAlchemyRecipe(recipe));
break;
}
src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIAltarRecipeHandler.java
+2 -2
View File
@@ -66,7 +66,7 @@ public class NEIAltarRecipeHandler extends TemplateRecipeHandler {
@Override
public void loadCraftingRecipes(ItemStack result) {
for(AltarRecipe recipe: AltarRecipeRegistry.altarRecipes) {
if(NEIServerUtils.areStacksSameTypeCrafting(recipe.result, result)) {
if(NEIServerUtils.areStacksSameTypeCraftingWithNBT(recipe.result, result)) {
if(recipe != null && recipe.result != null) arecipes.add(new CachedAltarRecipe(recipe));
}
}
@@ -75,7 +75,7 @@ public class NEIAltarRecipeHandler extends TemplateRecipeHandler {
@Override
public void loadUsageRecipes(ItemStack ingredient) {
for(AltarRecipe recipe: AltarRecipeRegistry.altarRecipes) {
if(NEIServerUtils.areStacksSameTypeCrafting(recipe.requiredItem, ingredient)) {
if(NEIServerUtils.areStacksSameTypeCraftingWithNBT(recipe.requiredItem, ingredient)) {
if(recipe != null && recipe.result != null) arecipes.add(new CachedAltarRecipe(recipe));
}
}
src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBindingRitualHandler.java
+2 -2
View File
@@ -65,7 +65,7 @@ public class NEIBindingRitualHandler extends TemplateRecipeHandler
{
for (BindingRecipe recipe: BindingRegistry.bindingRecipes)
{
if (NEIServerUtils.areStacksSameTypeCrafting(recipe.outputItem, result))
if (NEIServerUtils.areStacksSameTypeCraftingWithNBT(recipe.outputItem, result))
{
if (recipe != null && recipe.outputItem != null)
{
@@ -80,7 +80,7 @@ public class NEIBindingRitualHandler extends TemplateRecipeHandler
{
for (BindingRecipe recipe: BindingRegistry.bindingRecipes)
{
if (NEIServerUtils.areStacksSameTypeCrafting(recipe.requiredItem, ingredient))
if (NEIServerUtils.areStacksSameTypeCraftingWithNBT(recipe.requiredItem, ingredient))
{
if (recipe != null && recipe.outputItem != null)
{
src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBloodOrbShapedHandler.java
+1 -1
View File
@@ -83,7 +83,7 @@ public class NEIBloodOrbShapedHandler extends ShapedRecipeHandler {
for (IRecipe irecipe : (List<IRecipe>) CraftingManager.getInstance().getRecipeList()) {
if (irecipe instanceof ShapedBloodOrbRecipe) {
CachedBloodOrbRecipe recipe = forgeShapedRecipe((ShapedBloodOrbRecipe) irecipe);
if (recipe == null || !NEIServerUtils.areStacksSameTypeCrafting(recipe.result.item, result))
if (recipe == null || !NEIServerUtils.areStacksSameTypeCraftingWithNBT(recipe.result.item, result))
continue;
recipe.computeVisuals();
src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBloodOrbShapelessHandler.java
+1 -1
View File
@@ -77,7 +77,7 @@ public class NEIBloodOrbShapelessHandler extends ShapelessRecipeHandler {
public void loadCraftingRecipes(ItemStack result) {
List<IRecipe> allrecipes = CraftingManager.getInstance().getRecipeList();
for (IRecipe irecipe : allrecipes) {
if (NEIServerUtils.areStacksSameTypeCrafting(irecipe.getRecipeOutput(), result)) {
if (NEIServerUtils.areStacksSameTypeCraftingWithNBT(irecipe.getRecipeOutput(), result)) {
CachedBloodOrbRecipe recipe = null;
if (irecipe instanceof ShapelessBloodOrbRecipe)
recipe = forgeShapelessRecipe((ShapelessBloodOrbRecipe) irecipe);