lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Changed LavaCrystal getBinding behaviour, cleaned up JEI hiding

Browse source
This commit is contained in:
TeamDman 2018-12-07 01:57:41 -05:00 committed by Nick Ignoffo
parent 88e72ee013
commit 002f23c53d
3 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java
View file

@ -91,15 +91,10 @@ public class BloodMagicJEIPlugin implements IModPlugin {
registry.addRecipeCatalyst(new ItemStack(RegistrarBloodMagicBlocks.RITUAL_CONTROLLER), Constants.Compat.JEI_CATEGORY_ARMOURDOWNGRADE); registry.addRecipeCatalyst(new ItemStack(RegistrarBloodMagicBlocks.RITUAL_CONTROLLER), Constants.Compat.JEI_CATEGORY_ARMOURDOWNGRADE);
if (!ConfigHandler.general.enableTierSixEvenThoughThereIsNoContent) { if (!ConfigHandler.general.enableTierSixEvenThoughThereIsNoContent) {
for (ItemStack stack : new ItemStack[]{ jeiHelper.getIngredientBlacklist().addIngredientToBlacklist(new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK, 1, EnumDecorative.CRYSTAL_TILE.ordinal()));
// OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_TRANSCENDENT), //unregistered elsewhere jeiHelper.getIngredientBlacklist().addIngredientToBlacklist(new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK, 1, EnumDecorative.CRYSTAL_BRICK.ordinal()));
new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK, 1, EnumDecorative.CRYSTAL_TILE.ordinal()), jeiHelper.getIngredientBlacklist().addIngredientToBlacklist(new ItemStack(RegistrarBloodMagicItems.INSCRIPTION_TOOL, 1, EnumRuneType.DAWN.ordinal()));
new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK, 1, EnumDecorative.CRYSTAL_BRICK.ordinal()), }
new ItemStack(RegistrarBloodMagicItems.INSCRIPTION_TOOL, 1, EnumRuneType.DAWN.ordinal())
}) {
jeiHelper.getIngredientBlacklist().addIngredientToBlacklist(stack);
}
}
} }
@Override @Override

5
src/main/java/WayofTime/bloodmagic/core/data/Binding.java
View file

@ -57,12 +57,9 @@ public class Binding implements INBTSerializable<NBTTagCompound> {
@Nullable @Nullable
public static Binding fromStack(ItemStack stack) { public static Binding fromStack(ItemStack stack) {
// if (!stack.hasTagCompound()) // Definitely hasn't been bound yet. if (!stack.hasTagCompound()) // Definitely hasn't been bound yet.
// return null;
if (stack.getTagCompound() == null) // hasTagCompound doesn't work on empty stacks with tags
return null; return null;
NBTBase bindingTag = stack.getTagCompound().getTag("binding"); NBTBase bindingTag = stack.getTagCompound().getTag("binding");
if (bindingTag == null || bindingTag.getId() != 10 || bindingTag.hasNoTags()) // Make sure it's both a tag compound and that it has actual data. if (bindingTag == null || bindingTag.getId() != 10 || bindingTag.hasNoTags()) // Make sure it's both a tag compound and that it has actual data.
return null; return null;

13
src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java
View file

@ -10,6 +10,9 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.MobEffects; import net.minecraft.init.MobEffects;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTUtil;
import net.minecraft.potion.PotionEffect; import net.minecraft.potion.PotionEffect;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
@ -59,7 +62,15 @@ public class ItemLavaCrystal extends ItemBindableBase implements IVariantProvide
@Nullable @Nullable
@Override @Override
public Binding getBinding(ItemStack stack) { public Binding getBinding(ItemStack stack) {
return Binding.fromStack(stack); if (stack.getTagCompound() == null) // hasTagCompound doesn't work on empty stacks with tags
return null;
NBTBase bindingTag = stack.getTagCompound().getTag("binding");
if (bindingTag == null || bindingTag.getId() != 10 || bindingTag.hasNoTags()) // Make sure it's both a tag compound and that it has actual data.
return null;
NBTTagCompound nbt = (NBTTagCompound) bindingTag;
return new Binding(NBTUtil.getUUIDFromTag(nbt.getCompoundTag("id")),nbt.getString("name"));
} }
@Override @Override