Skip to content

Fix voidsent boots #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Dream-Master merged 2 commits into from
Sep 5, 2025
Merged

Fix voidsent boots #40

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ccbb530
Cleanup of RecipeVoidsentBlood code
Worive Sep 5, 2025
962fa32
Fix voidsent blood not working with cultist Boots
Worive Sep 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 41 additions & 18 deletions src/main/java/taintedmagic/api/RecipeVoidsentBlood.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,52 @@
package taintedmagic.api;

import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;

import taintedmagic.common.items.ItemVoidsentBlood;
import thaumcraft.common.items.armor.ItemCultistBoots;
import thaumcraft.common.items.armor.ItemCultistLeaderArmor;
import thaumcraft.common.items.armor.ItemCultistPlateArmor;
import thaumcraft.common.items.armor.ItemCultistRobeArmor;

/**
* Custom recipe for aplpying Voidsent Blood to Cult Attire
* Custom recipe for applying Voidsent Blood to Cult Attire
*/
public class RecipeVoidsentBlood implements IRecipe {

private boolean isValidArmor(Item item) {
return item instanceof ItemCultistRobeArmor || item instanceof ItemCultistPlateArmor
|| item instanceof ItemCultistLeaderArmor
|| item instanceof ItemCultistBoots;
}

private boolean isValidBlood(Item item) {
return item instanceof ItemVoidsentBlood;
}

@Override
public boolean matches(InventoryCrafting inv, World w) {
boolean foundBlood = false;
boolean foundArmor = false;

for (int i = 0; i < inv.getSizeInventory(); i++) {
ItemStack s = inv.getStackInSlot(i);
ItemStack itemStack = inv.getStackInSlot(i);

if (s != null) {
if (s.getItem() instanceof ItemVoidsentBlood && !foundBlood) foundBlood = true;
else if ((s.getItem() instanceof ItemCultistRobeArmor || s.getItem() instanceof ItemCultistPlateArmor
|| s.getItem() instanceof ItemCultistLeaderArmor) && !foundArmor)
foundArmor = true;
if (itemStack == null) continue;

else return false;
if (isValidBlood(itemStack.getItem()) && !foundBlood) {
foundBlood = true;
} else if (isValidArmor(itemStack.getItem()) && !foundArmor) {
foundArmor = true;
} else {
return false;
}
}

return foundBlood && foundArmor;
}

Expand All @@ -42,21 +56,30 @@ public ItemStack getCraftingResult(InventoryCrafting inv) {
ItemStack armor = null;
ItemStack blood = null;

// First, find the required ingredients in the crafting grid.
for (int i = 0; i < inv.getSizeInventory(); i++) {
if (inv.getStackInSlot(i) != null && (inv.getStackInSlot(i).getItem() instanceof ItemCultistRobeArmor
|| inv.getStackInSlot(i).getItem() instanceof ItemCultistPlateArmor
|| inv.getStackInSlot(i).getItem() instanceof ItemCultistLeaderArmor))
armor = inv.getStackInSlot(i);
else if (inv.getStackInSlot(i) != null && inv.getStackInSlot(i).getItem() instanceof ItemVoidsentBlood)
blood = inv.getStackInSlot(i);
ItemStack itemStack = inv.getStackInSlot(i);

if (itemStack == null) continue;

if (isValidArmor(itemStack.getItem())) {
armor = itemStack;
} else if (isValidBlood(itemStack.getItem())) {
blood = itemStack;
}
}

// Check that both items exist and that the armor is not already voidtouched.
if (armor != null && blood != null
&& (armor.getTagCompound() == null
|| (armor.getTagCompound() != null && !armor.getTagCompound().getBoolean("voidtouched")))) {
&& !(armor.hasTagCompound() && armor.getTagCompound().getBoolean("voidtouched"))) {
copy = armor.copy();
if (copy.getTagCompound() == null) copy.setTagCompound(new NBTTagCompound());
if (copy.getTagCompound() != null) copy.getTagCompound().setBoolean("voidtouched", true);

NBTTagCompound nbt = copy.hasTagCompound() ? copy.getTagCompound() : new NBTTagCompound();

nbt.setBoolean("voidtouched", true);
copy.setTagCompound(nbt);
}

return copy;
}

Expand Down