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

this doesn't compile yet, but have something to peek at

Browse source
This commit is contained in:
Nicholas Ignoffo 2017-08-14 20:53:42 -07:00
parent 973f1019a5
commit 5fcdd978d7
329 changed files with 3247 additions and 2953 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java
View file

@ -1,6 +1,6 @@
package WayofTime.bloodmagic.item;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.client.IVariantProvider;
import WayofTime.bloodmagic.util.helper.TextHelper;
import net.minecraft.creativetab.CreativeTabs;
@ -24,7 +24,7 @@ public class ItemActivationCrystal extends ItemBindableBase implements IVariantP
{
super();
setUnlocalizedName(Constants.Mod.MODID + ".activationCrystal.");
setUnlocalizedName(BloodMagic.MODID + ".activationCrystal.");
setHasSubtypes(true);
}

4
src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java
View file

@ -41,8 +41,8 @@ public class ItemAltarMaker extends Item implements IAltarManipulator, IVariantP
public ItemAltarMaker()
{
super();
setUnlocalizedName(Constants.Mod.MODID + ".altarMaker");
setCreativeTab(BloodMagic.tabBloodMagic);
setUnlocalizedName(BloodMagic.MODID + ".altarMaker");
setCreativeTab(BloodMagic.TAB_BM);
setMaxStackSize(1);
setFull3D();
}

9
src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java
View file

@ -19,9 +19,8 @@ import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.client.IVariantProvider;
import WayofTime.bloodmagic.registry.ModBlocks;
import WayofTime.bloodmagic.registry.RegistrarBloodMagicBlocks;
import WayofTime.bloodmagic.tile.TileAlchemyArray;
import WayofTime.bloodmagic.util.helper.TextHelper;
@ -29,10 +28,10 @@ public class ItemArcaneAshes extends Item implements IVariantProvider
{
public ItemArcaneAshes()
{
setUnlocalizedName(Constants.Mod.MODID + ".arcaneAshes");
setUnlocalizedName(BloodMagic.MODID + ".arcaneAshes");
setMaxStackSize(1);
setMaxDamage(19); //Allows for 20 uses
setCreativeTab(BloodMagic.tabBloodMagic);
setCreativeTab(BloodMagic.TAB_BM);
}
@Override
@ -53,7 +52,7 @@ public class ItemArcaneAshes extends Item implements IVariantProvider
if (!world.isRemote)
{
EnumFacing rotation = EnumFacing.fromAngle(player.getRotationYawHead());
world.setBlockState(newPos, ModBlocks.ALCHEMY_ARRAY.getDefaultState());
world.setBlockState(newPos, RegistrarBloodMagicBlocks.ALCHEMY_ARRAY.getDefaultState());
TileEntity tile = world.getTileEntity(newPos);
if (tile instanceof TileAlchemyArray)
{

3
src/main/java/WayofTime/bloodmagic/item/ItemBindableBase.java
View file

@ -2,7 +2,6 @@ package WayofTime.bloodmagic.item;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.impl.ItemBindable;
import WayofTime.bloodmagic.api.util.helper.NBTHelper;
import WayofTime.bloodmagic.api.util.helper.PlayerHelper;
import WayofTime.bloodmagic.util.helper.TextHelper;
import com.google.common.base.Strings;
@ -19,7 +18,7 @@ public class ItemBindableBase extends ItemBindable
{
super();
setCreativeTab(BloodMagic.tabBloodMagic);
setCreativeTab(BloodMagic.TAB_BM);
}
@Override

70
src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java
View file

@ -2,19 +2,18 @@ package WayofTime.bloodmagic.item;
import java.util.List;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.registry.RegistrarBloodMagic;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.SoundEvents;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ActionResult;
import net.minecraft.util.EnumHand;
import net.minecraft.util.NonNullList;
import net.minecraft.util.SoundCategory;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.*;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.iface.IBindable;
import WayofTime.bloodmagic.api.orb.BloodOrb;
import WayofTime.bloodmagic.api.orb.IBloodOrb;
@ -25,11 +24,13 @@ import WayofTime.bloodmagic.util.helper.TextHelper;
import com.google.common.base.Strings;
import javax.annotation.Nullable;
public class ItemBloodOrb extends ItemBindableBase implements IBloodOrb, IBindable
{
public ItemBloodOrb()
{
setUnlocalizedName(Constants.Mod.MODID + ".orb.");
setUnlocalizedName(BloodMagic.MODID + ".orb");
this.setMaxDamage(0);
setHasSubtypes(true);
}
@ -37,27 +38,41 @@ public class ItemBloodOrb extends ItemBindableBase implements IBloodOrb, IBindab
@Override
public String getUnlocalizedName(ItemStack stack)
{
return super.getUnlocalizedName(stack) + OrbRegistry.getOrb(stack.getItemDamage()).getName();
BloodOrb orb = getOrb(stack);
if (orb == null)
return super.getUnlocalizedName(stack);
return super.getUnlocalizedName(stack) + "." + orb.getName();
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(Item id, CreativeTabs creativeTab, NonNullList<ItemStack> list)
public void getSubItems(CreativeTabs creativeTab, NonNullList<ItemStack> list)
{
for (int i = 0; i < OrbRegistry.getSize(); i++)
list.add(new ItemStack(id, 1, i));
if (!isInCreativeTab(creativeTab))
return;
for (BloodOrb orb : RegistrarBloodMagic.BLOOD_ORBS) {
ItemStack orbStack = new ItemStack(this);
NBTTagCompound tag = new NBTTagCompound();
tag.setString("orb", orb.getRegistryName().toString());
orbStack.setTagCompound(tag);
list.add(orbStack);
}
}
@Override
public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player, EnumHand hand)
{
ItemStack stack = player.getHeldItem(hand);
BloodOrb orb = getOrb(stack);
if (orb == null)
return ActionResult.newResult(EnumActionResult.FAIL, stack);
if (world == null)
return super.onItemRightClick(world, player, hand);
world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.BLOCKS, 0.5F, 2.6F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.8F);
// SpellHelper.sendIndexedParticleToAllAround(world, posX, posY, posZ,
// 20, world.provider.getDimensionId(), 4, posX, posY, posZ);
if (PlayerHelper.isFakePlayer(player))
return super.onItemRightClick(world, player, hand);
@ -74,9 +89,9 @@ public class ItemBloodOrb extends ItemBindableBase implements IBloodOrb, IBindab
return super.onItemRightClick(world, player, hand);
if (getOwnerUUID(stack).equals(PlayerHelper.getUsernameFromPlayer(player)))
NetworkHelper.setMaxOrb(NetworkHelper.getSoulNetwork(getOwnerUUID(stack)), getOrbLevel(stack.getItemDamage()));
NetworkHelper.setMaxOrb(NetworkHelper.getSoulNetwork(getOwnerUUID(stack)), orb.getTier());
NetworkHelper.getSoulNetwork(getOwnerUUID(stack)).add(200, getMaxEssence(stack.getItemDamage()));
NetworkHelper.getSoulNetwork(getOwnerUUID(stack)).add(200, orb.getCapacity());
NetworkHelper.getSoulNetwork(player).hurtPlayer(player, 200);
return super.onItemRightClick(world, player, hand);
}
@ -87,8 +102,9 @@ public class ItemBloodOrb extends ItemBindableBase implements IBloodOrb, IBindab
{
tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.orb.desc"));
if (advanced)
tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.orb.owner", getOrb(stack.getItemDamage()).getOwner()));
BloodOrb orb = getOrb(stack);
if (advanced && orb != null)
tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.orb.owner", orb.getRegistryName()));
super.addInformation(stack, player, tooltip, advanced);
}
@ -115,21 +131,13 @@ public class ItemBloodOrb extends ItemBindableBase implements IBloodOrb, IBindab
// IBloodOrb
@Nullable
@Override
public BloodOrb getOrb(int meta)
{
return OrbRegistry.getOrb(meta);
}
public BloodOrb getOrb(ItemStack stack) {
if (!stack.hasTagCompound())
return null;
@Override
public int getMaxEssence(int meta)
{
return OrbRegistry.getOrb(meta).getCapacity();
}
@Override
public int getOrbLevel(int meta)
{
return OrbRegistry.getOrb(meta).getTier();
ResourceLocation id = new ResourceLocation(stack.getTagCompound().getString("orb"));
return RegistrarBloodMagic.BLOOD_ORBS.getValue(id);
}
}

5
src/main/java/WayofTime/bloodmagic/item/ItemBloodShard.java
View file

@ -1,7 +1,6 @@
package WayofTime.bloodmagic.item;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.client.IVariantProvider;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
@ -23,8 +22,8 @@ public class ItemBloodShard extends Item implements IVariantProvider
{
super();
setCreativeTab(BloodMagic.tabBloodMagic);
setUnlocalizedName(Constants.Mod.MODID + ".bloodShard.");
setCreativeTab(BloodMagic.TAB_BM);
setUnlocalizedName(BloodMagic.MODID + ".bloodShard.");
setHasSubtypes(true);
}

2
src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java
View file

@ -67,7 +67,7 @@ public class ItemBoundAxe extends ItemBoundTool implements IMeshProvider
boolean silkTouch = EnchantmentHelper.getEnchantmentLevel(Enchantments.SILK_TOUCH, stack) > 0;
int fortuneLvl = EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, stack);
int range = (int) (charge / 6); //Charge is a max of 30 - want 5 to be the max
int range = charge / 6; //Charge is a max of 30 - want 5 to be the max
HashMultiset<ItemStackWrapper> drops = HashMultiset.create();

2
src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java
View file

@ -66,7 +66,7 @@ public class ItemBoundShovel extends ItemBoundTool implements IMeshProvider
boolean silkTouch = EnchantmentHelper.getEnchantmentLevel(Enchantments.SILK_TOUCH, stack) > 0;
int fortuneLvl = EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, stack);
int range = (int) (charge / 6); //Charge is a max of 30 - want 5 to be the max
int range = charge / 6; //Charge is a max of 30 - want 5 to be the max
HashMultiset<ItemStackWrapper> drops = HashMultiset.create();

8
src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java
View file

@ -35,7 +35,7 @@ import WayofTime.bloodmagic.api.util.helper.NBTHelper;
import WayofTime.bloodmagic.api.util.helper.PlayerHelper;
import WayofTime.bloodmagic.client.IMeshProvider;
import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable;
import WayofTime.bloodmagic.registry.ModItems;
import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
import WayofTime.bloodmagic.util.helper.TextHelper;
import com.google.common.base.Strings;
@ -46,10 +46,10 @@ public class ItemBoundSword extends ItemSword implements IBindable, IActivatable
{
public ItemBoundSword()
{
super(ModItems.BOUND_TOOL_MATERIAL);
super(RegistrarBloodMagicItems.BOUND_TOOL_MATERIAL);
setUnlocalizedName(Constants.Mod.MODID + ".bound.sword");
setCreativeTab(BloodMagic.tabBloodMagic);
setUnlocalizedName(BloodMagic.MODID + ".bound.sword");
setCreativeTab(BloodMagic.TAB_BM);
}
@Override

8
src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java
View file

@ -41,7 +41,7 @@ import WayofTime.bloodmagic.api.event.BoundToolEvent;
import WayofTime.bloodmagic.api.iface.IActivatable;
import WayofTime.bloodmagic.api.iface.IBindable;
import WayofTime.bloodmagic.api.util.helper.NBTHelper;
import WayofTime.bloodmagic.registry.ModItems;
import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
import WayofTime.bloodmagic.util.helper.TextHelper;
import com.google.common.collect.ImmutableSet;
@ -60,9 +60,9 @@ public class ItemBoundTool extends ItemTool implements IBindable, IActivatable
public ItemBoundTool(String name, float damage, Set<Block> effectiveBlocks)
{
super(damage, 1, ModItems.BOUND_TOOL_MATERIAL, effectiveBlocks);
setUnlocalizedName(Constants.Mod.MODID + ".bound." + name);
setCreativeTab(BloodMagic.tabBloodMagic);
super(damage, 1, RegistrarBloodMagicItems.BOUND_TOOL_MATERIAL, effectiveBlocks);
setUnlocalizedName(BloodMagic.MODID + ".bound." + name);
setCreativeTab(BloodMagic.TAB_BM);
setHarvestLevel(name, 4);
this.name = name;

9
src/main/java/WayofTime/bloodmagic/item/ItemComponent.java
View file

@ -15,9 +15,8 @@ import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.client.IVariantProvider;
import WayofTime.bloodmagic.registry.ModItems;
import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
public class ItemComponent extends Item implements IVariantProvider
{
@ -62,9 +61,9 @@ public class ItemComponent extends Item implements IVariantProvider
{
super();
setUnlocalizedName(Constants.Mod.MODID + ".baseComponent.");
setUnlocalizedName(BloodMagic.MODID + ".baseComponent.");
setHasSubtypes(true);
setCreativeTab(BloodMagic.tabBloodMagic);
setCreativeTab(BloodMagic.TAB_BM);
buildItemList();
}
@ -122,7 +121,7 @@ public class ItemComponent extends Item implements IVariantProvider
public static ItemStack getStack(String name)
{
return new ItemStack(ModItems.ITEM_COMPONENT, 1, names.indexOf(name));
return new ItemStack(RegistrarBloodMagicItems.ITEM_COMPONENT, 1, names.indexOf(name));
}
@Override

5
src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java
View file

@ -20,7 +20,6 @@ import org.apache.commons.lang3.tuple.Pair;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.ConfigHandler;
import WayofTime.bloodmagic.api.BloodMagicAPI;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.util.helper.PlayerSacrificeHelper;
import WayofTime.bloodmagic.api.util.helper.PurificationHelper;
import WayofTime.bloodmagic.client.IVariantProvider;
@ -30,8 +29,8 @@ public class ItemDaggerOfSacrifice extends Item implements IVariantProvider
public ItemDaggerOfSacrifice()
{
super();
setUnlocalizedName(Constants.Mod.MODID + ".daggerOfSacrifice");
setCreativeTab(BloodMagic.tabBloodMagic);
setUnlocalizedName(BloodMagic.MODID + ".daggerOfSacrifice");
setCreativeTab(BloodMagic.TAB_BM);
setMaxStackSize(1);
setFull3D();
}

39
src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java
View file

@ -3,7 +3,7 @@ package WayofTime.bloodmagic.item;
import java.util.ArrayList;
import java.util.List;
import lombok.Getter;
import com.google.common.collect.Lists;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@ -16,16 +16,14 @@ import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.soul.EnumDemonWillType;
import WayofTime.bloodmagic.api.soul.IDiscreteDemonWill;
import WayofTime.bloodmagic.client.IVariantProvider;
import WayofTime.bloodmagic.registry.ModItems;
import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
public class ItemDemonCrystal extends Item implements IDiscreteDemonWill, IVariantProvider
{
@Getter
private static ArrayList<String> names = new ArrayList<String>();
public static final ArrayList<String> NAMES = Lists.newArrayList();
public static final String CRYSTAL_DEFAULT = "crystalDefault";
public static final String CRYSTAL_CORROSIVE = "crystalCorrosive";
@ -37,39 +35,42 @@ public class ItemDemonCrystal extends Item implements IDiscreteDemonWill, IVaria
{
super();
setUnlocalizedName(Constants.Mod.MODID + ".demonCrystal.");
setUnlocalizedName(BloodMagic.MODID + ".demonCrystal.");
setHasSubtypes(true);
setCreativeTab(BloodMagic.tabBloodMagic);
setCreativeTab(BloodMagic.TAB_BM);
buildItemList();
}
private void buildItemList()
{
names.add(0, CRYSTAL_DEFAULT);
names.add(1, CRYSTAL_CORROSIVE);
names.add(2, CRYSTAL_DESTRUCTIVE);
names.add(3, CRYSTAL_VENGEFUL);
names.add(4, CRYSTAL_STEADFAST);
NAMES.add(0, CRYSTAL_DEFAULT);
NAMES.add(1, CRYSTAL_CORROSIVE);
NAMES.add(2, CRYSTAL_DESTRUCTIVE);
NAMES.add(3, CRYSTAL_VENGEFUL);
NAMES.add(4, CRYSTAL_STEADFAST);
}
@Override
public String getUnlocalizedName(ItemStack stack)
{
return super.getUnlocalizedName(stack) + names.get(stack.getItemDamage());
return super.getUnlocalizedName(stack) + NAMES.get(stack.getItemDamage());
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(Item id, CreativeTabs creativeTab, NonNullList<ItemStack> list)
public void getSubItems(CreativeTabs creativeTab, NonNullList<ItemStack> list)
{
for (int i = 0; i < names.size(); i++)
list.add(new ItemStack(id, 1, i));
if (!isInCreativeTab(creativeTab))
return;
for (int i = 0; i < NAMES.size(); i++)
list.add(new ItemStack(this, 1, i));
}
public static ItemStack getStack(String name)
{
return new ItemStack(ModItems.ITEM_DEMON_CRYSTAL, 1, names.indexOf(name));
return new ItemStack(RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL, 1, NAMES.indexOf(name));
}
@Override
@ -109,8 +110,8 @@ public class ItemDemonCrystal extends Item implements IDiscreteDemonWill, IVaria
public List<Pair<Integer, String>> getVariants()
{
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
for (String name : names)
ret.add(new ImmutablePair<Integer, String>(names.indexOf(name), "type=" + name));
for (String name : NAMES)
ret.add(new ImmutablePair<Integer, String>(NAMES.indexOf(name), "type=" + name));
return ret;
}
}

5
src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java
View file

@ -15,7 +15,6 @@ import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.iface.IDemonWillViewer;
import WayofTime.bloodmagic.client.IVariantProvider;
import WayofTime.bloodmagic.util.helper.TextHelper;
@ -24,9 +23,9 @@ public class ItemDemonWillGauge extends Item implements IVariantProvider, IDemon
{
public ItemDemonWillGauge()
{
setUnlocalizedName(Constants.Mod.MODID + ".willGauge");
setUnlocalizedName(BloodMagic.MODID + ".willGauge");
setMaxStackSize(1);
setCreativeTab(BloodMagic.tabBloodMagic);
setCreativeTab(BloodMagic.TAB_BM);
}
@Override

5
src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java
View file

@ -19,7 +19,6 @@ import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.util.helper.NBTHelper;
import WayofTime.bloodmagic.client.IVariantProvider;
import WayofTime.bloodmagic.util.helper.TextHelper;
@ -28,9 +27,9 @@ public class ItemExperienceBook extends Item implements IVariantProvider
{
public ItemExperienceBook()
{
setUnlocalizedName(Constants.Mod.MODID + ".experienceTome");
setUnlocalizedName(BloodMagic.MODID + ".experienceTome");
setMaxStackSize(1);
setCreativeTab(BloodMagic.tabBloodMagic);
setCreativeTab(BloodMagic.TAB_BM);
}
@Override

3
src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java
View file

@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import WayofTime.bloodmagic.BloodMagic;
import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
@ -35,7 +36,7 @@ public class ItemInscriptionTool extends ItemBindableBase implements IVariantPro
{
super();
setUnlocalizedName(Constants.Mod.MODID + ".scribe.");
setUnlocalizedName(BloodMagic.MODID + ".scribe.");
setHasSubtypes(true);
}

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

@ -1,31 +1,26 @@
package WayofTime.bloodmagic.item;
import java.util.ArrayList;
import java.util.List;
import WayofTime.bloodmagic.BloodMagic;
import com.google.common.collect.Lists;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.MobEffects;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.potion.PotionEffect;
import net.minecraftforge.fml.common.IFuelHandler;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.util.helper.NetworkHelper;
import WayofTime.bloodmagic.api.util.helper.PlayerHelper;
import WayofTime.bloodmagic.client.IVariantProvider;
import com.google.common.base.Strings;
public class ItemLavaCrystal extends ItemBindableBase implements IFuelHandler, IVariantProvider
public class ItemLavaCrystal extends ItemBindableBase implements IVariantProvider
{
public ItemLavaCrystal()
{
super();
setUnlocalizedName(Constants.Mod.MODID + ".lavaCrystal");
setUnlocalizedName(BloodMagic.MODID + ".lavaCrystal");
}
@Override
@ -45,50 +40,26 @@ public class ItemLavaCrystal extends ItemBindableBase implements IFuelHandler, I
}
@Override
public int getBurnTime(ItemStack fuel)
{
if (fuel == null)
{
return 0;
public int getItemBurnTime(ItemStack stack) {
if (getOwnerUUID(stack) == null)
return -1;
if (NetworkHelper.canSyphonFromContainer(stack, 25))
return 200;
else {
EntityPlayer player = PlayerHelper.getPlayerFromUUID(getOwnerUUID(stack));
if (player != null)
player.addPotionEffect(new PotionEffect(MobEffects.NAUSEA, 99));
}
Item fuelItem = fuel.getItem();
if (fuelItem instanceof ItemLavaCrystal)
{
//
// if (FMLCommonHandler.instance().getSide() == Side.CLIENT)
// {
// return 200;
// }
// System.out.println(FMLCommonHandler.instance().getSide());
if (NetworkHelper.canSyphonFromContainer(fuel, 25))
{
return 200;
} else
{
if (!Strings.isNullOrEmpty(this.getOwnerUUID(fuel)))
{
EntityPlayer player = PlayerHelper.getPlayerFromUUID(this.getOwnerUUID(fuel));
if (player != null)
{
player.addPotionEffect(new PotionEffect(MobEffects.NAUSEA, 99));
}
}
return 0;
}
}
return 0;
return -1;
}
@Override
public List<Pair<Integer, String>> getVariants()
{
List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
ret.add(new ImmutablePair<Integer, String>(0, "type=normal"));
List<Pair<Integer, String>> ret = Lists.newArrayList();
ret.add(Pair.of(0, "type=normal"));
return ret;
}
}

8
src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java
View file

@ -1,6 +1,5 @@
package WayofTime.bloodmagic.item;
import java.util.ArrayList;
import java.util.List;
import WayofTime.bloodmagic.api.util.helper.NBTHelper;
@ -26,7 +25,6 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.Constants;
import javax.annotation.Nullable;
@ -34,8 +32,8 @@ public class ItemPotionFlask extends Item implements IMeshProvider
{
public ItemPotionFlask()
{
setUnlocalizedName(Constants.Mod.MODID + ".potionFlask");
setCreativeTab(BloodMagic.tabBloodMagic);
setUnlocalizedName(BloodMagic.MODID + ".potionFlask");
setCreativeTab(BloodMagic.TAB_BM);
setMaxStackSize(1);
setMaxDamage(8);
setNoRepair();
@ -149,7 +147,7 @@ public class ItemPotionFlask extends Item implements IMeshProvider
boolean full = true;
if (stack.hasTagCompound() && stack.getTagCompound().hasKey("empty"))
full = false;
return new ModelResourceLocation(new ResourceLocation(Constants.Mod.MODID, "item/" + getRegistryName().getResourcePath()), "full=" + (full ? "true" : "false"));
return new ModelResourceLocation(new ResourceLocation(BloodMagic.MODID, "item/" + getRegistryName().getResourcePath()), "full=" + (full ? "true" : "false"));
}
};
}

11
src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java
View file

@ -18,7 +18,6 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.*;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.util.text.TextComponentString;
import net.minecraft.util.text.TextComponentTranslation;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
@ -37,7 +36,7 @@ import WayofTime.bloodmagic.api.ritual.RitualComponent;
import WayofTime.bloodmagic.api.soul.EnumDemonWillType;
import WayofTime.bloodmagic.api.util.helper.RitualHelper;
import WayofTime.bloodmagic.client.IVariantProvider;
import WayofTime.bloodmagic.registry.ModBlocks;
import WayofTime.bloodmagic.registry.RegistrarBloodMagicBlocks;
import WayofTime.bloodmagic.tile.TileMasterRitualStone;
import WayofTime.bloodmagic.util.ChatUtil;
import WayofTime.bloodmagic.util.Utils;
@ -52,8 +51,8 @@ public class ItemRitualDiviner extends Item implements IVariantProvider
public ItemRitualDiviner()
{
setUnlocalizedName(Constants.Mod.MODID + ".ritualDiviner");
setCreativeTab(BloodMagic.tabBloodMagic);
setUnlocalizedName(BloodMagic.MODID + ".ritualDiviner");
setCreativeTab(BloodMagic.TAB_BM);
setHasSubtypes(true);
setMaxStackSize(1);
}
@ -166,7 +165,7 @@ public class ItemRitualDiviner extends Item implements IVariantProvider
return false;
}
int meta = component.getRuneType().ordinal();
IBlockState newState = ModBlocks.RITUAL_STONE.getStateFromMeta(meta);
IBlockState newState = RegistrarBloodMagicBlocks.RITUAL_STONE.getStateFromMeta(meta);
world.setBlockState(newPos, newState);
return true;
} else
@ -224,7 +223,7 @@ public class ItemRitualDiviner extends Item implements IVariantProvider
if (item instanceof ItemBlock)
{
Block block = ((ItemBlock) item).getBlock();
if (block == ModBlocks.RITUAL_STONE)
if (block == RegistrarBloodMagicBlocks.RITUAL_STONE)
{
newStack.shrink(1);
return true;

3
src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java
View file

@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import WayofTime.bloodmagic.BloodMagic;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@ -38,7 +39,7 @@ public class ItemRitualReader extends Item implements IVariantProvider
public ItemRitualReader()
{
super();
setUnlocalizedName(Constants.Mod.MODID + ".ritualReader");
setUnlocalizedName(BloodMagic.MODID + ".ritualReader");
setMaxStackSize(1);
}

10
src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java
View file

@ -24,9 +24,6 @@ import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.BloodMagicAPI;
import WayofTime.bloodmagic.api.Constants;
@ -34,7 +31,6 @@ import WayofTime.bloodmagic.api.event.SacrificeKnifeUsedEvent;
import WayofTime.bloodmagic.api.util.helper.NBTHelper;
import WayofTime.bloodmagic.api.util.helper.PlayerHelper;
import WayofTime.bloodmagic.api.util.helper.PlayerSacrificeHelper;
import WayofTime.bloodmagic.client.IVariantProvider;
import WayofTime.bloodmagic.tile.TileAltar;
import WayofTime.bloodmagic.util.helper.TextHelper;
@ -48,8 +44,8 @@ public class ItemSacrificialDagger extends Item implements IMeshProvider
{
super();
setUnlocalizedName(Constants.Mod.MODID + ".sacrificialDagger.");
setCreativeTab(BloodMagic.tabBloodMagic);
setUnlocalizedName(BloodMagic.MODID + ".sacrificialDagger.");
setCreativeTab(BloodMagic.TAB_BM);
setHasSubtypes(true);
setMaxStackSize(1);
setFull3D();
@ -203,7 +199,7 @@ public class ItemSacrificialDagger extends Item implements IMeshProvider
if (canUseForSacrifice(stack))
variant = "type=ceremonial";
return new ModelResourceLocation(new ResourceLocation(Constants.Mod.MODID, "item/ItemSacrificialDagger"), variant);
return new ModelResourceLocation(new ResourceLocation(BloodMagic.MODID, "item/ItemSacrificialDagger"), variant);
}
};
}

4
src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java
View file

@ -38,8 +38,8 @@ public class ItemSanguineBook extends Item implements IVariantProvider, IAltarMa
public ItemSanguineBook()
{
setUnlocalizedName(Constants.Mod.MODID + ".sanguineBook");
setCreativeTab(BloodMagic.tabBloodMagic);
setUnlocalizedName(BloodMagic.MODID + ".sanguineBook");
setCreativeTab(BloodMagic.TAB_BM);
setMaxStackSize(1);
}

5
src/main/java/WayofTime/bloodmagic/item/ItemSlate.java
View file

@ -1,7 +1,6 @@
package WayofTime.bloodmagic.item;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.client.IVariantProvider;
import WayofTime.bloodmagic.util.helper.TextHelper;
import net.minecraft.creativetab.CreativeTabs;
@ -26,8 +25,8 @@ public class ItemSlate extends Item implements IVariantProvider
{
super();
setCreativeTab(BloodMagic.tabBloodMagic);
setUnlocalizedName(Constants.Mod.MODID + ".slate.");
setCreativeTab(BloodMagic.TAB_BM);
setUnlocalizedName(BloodMagic.MODID + ".slate.");
setHasSubtypes(true);
}

4
src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java
View file

@ -34,8 +34,8 @@ public class ItemTelepositionFocus extends ItemBindableBase implements IVariantP
{
super();
setUnlocalizedName(Constants.Mod.MODID + ".focus.");
setCreativeTab(BloodMagic.tabBloodMagic);
setUnlocalizedName(BloodMagic.MODID + ".focus.");
setCreativeTab(BloodMagic.TAB_BM);
setMaxStackSize(1);
setHasSubtypes(true);
}

7
src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java
View file

@ -20,7 +20,6 @@ import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourHandler;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
import WayofTime.bloodmagic.api.util.helper.ItemHelper.LivingUpgrades;
@ -35,8 +34,8 @@ public class ItemUpgradeTome extends Item implements IVariantProvider
{
super();
setCreativeTab(BloodMagic.tabUpgradeTome);
setUnlocalizedName(Constants.Mod.MODID + ".upgradeTome");
setCreativeTab(BloodMagic.TAB_TOMES);
setUnlocalizedName(BloodMagic.MODID + ".upgradeTome");
setHasSubtypes(true);
setMaxStackSize(1);
}
@ -82,7 +81,7 @@ public class ItemUpgradeTome extends Item implements IVariantProvider
LivingArmourUpgrade upgrade = LivingUpgrades.getUpgrade(stack);
if (upgrade != null && upgrade.isDowngrade())
return "item." + Constants.Mod.MODID + ".downgradeTome";
return "item." + BloodMagic.MODID + ".downgradeTome";
return super.getUnlocalizedName(stack);
}

5
src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java
View file

@ -1,7 +1,6 @@
package WayofTime.bloodmagic.item;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.iface.IUpgradeTrainer;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourHandler;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
@ -28,8 +27,8 @@ public class ItemUpgradeTrainer extends Item implements IUpgradeTrainer, IVarian
{
super();
setCreativeTab(BloodMagic.tabUpgradeTome);
setUnlocalizedName(Constants.Mod.MODID + ".upgradeTrainer");
setCreativeTab(BloodMagic.TAB_TOMES);
setUnlocalizedName(BloodMagic.MODID + ".upgradeTrainer");
setHasSubtypes(true);
setMaxStackSize(1);
}

9
src/main/java/WayofTime/bloodmagic/item/alchemy/ItemCuttingFluid.java
View file

@ -17,11 +17,10 @@ import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.iface.ICustomAlchemyConsumable;
import WayofTime.bloodmagic.api.util.helper.NBTHelper;
import WayofTime.bloodmagic.client.IVariantProvider;
import WayofTime.bloodmagic.registry.ModItems;
import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
import WayofTime.bloodmagic.util.helper.TextHelper;
public class ItemCuttingFluid extends Item implements IVariantProvider, ICustomAlchemyConsumable
@ -36,9 +35,9 @@ public class ItemCuttingFluid extends Item implements IVariantProvider, ICustomA
{
super();
setUnlocalizedName(Constants.Mod.MODID + ".cuttingFluid.");
setUnlocalizedName(BloodMagic.MODID + ".cuttingFluid.");
setHasSubtypes(true);
setCreativeTab(BloodMagic.tabBloodMagic);
setCreativeTab(BloodMagic.TAB_BM);
setMaxStackSize(1);
buildItemList();
@ -76,7 +75,7 @@ public class ItemCuttingFluid extends Item implements IVariantProvider, ICustomA
public static ItemStack getStack(String name)
{
return new ItemStack(ModItems.CUTTING_FLUID, 1, names.indexOf(name));
return new ItemStack(RegistrarBloodMagicItems.CUTTING_FLUID, 1, names.indexOf(name));
}
@Override

9
src/main/java/WayofTime/bloodmagic/item/alchemy/ItemLivingArmourPointsUpgrade.java
View file

@ -25,11 +25,10 @@ import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.client.IVariantProvider;
import WayofTime.bloodmagic.item.armour.ItemLivingArmour;
import WayofTime.bloodmagic.livingArmour.LivingArmour;
import WayofTime.bloodmagic.registry.ModItems;
import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
import WayofTime.bloodmagic.util.helper.TextHelper;
import com.google.common.collect.Iterables;
@ -45,9 +44,9 @@ public class ItemLivingArmourPointsUpgrade extends Item implements IVariantProvi
{
super();
setUnlocalizedName(Constants.Mod.MODID + ".livingPointUpgrade.");
setUnlocalizedName(BloodMagic.MODID + ".livingPointUpgrade.");
setHasSubtypes(true);
setCreativeTab(BloodMagic.tabBloodMagic);
setCreativeTab(BloodMagic.TAB_BM);
buildItemList();
}
@ -137,7 +136,7 @@ public class ItemLivingArmourPointsUpgrade extends Item implements IVariantProvi
public static ItemStack getStack(String name)
{
return new ItemStack(ModItems.ITEM_POINTS_UPGRADE, 1, names.indexOf(name));
return new ItemStack(RegistrarBloodMagicItems.ITEM_POINTS_UPGRADE, 1, names.indexOf(name));
}
@Override

48
src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java
View file

@ -45,7 +45,7 @@ import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerRepairing;
import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeElytra;
import WayofTime.bloodmagic.network.BloodMagicPacketHandler;
import WayofTime.bloodmagic.network.PlayerFallDistancePacketProcessor;
import WayofTime.bloodmagic.registry.ModItems;
import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
import WayofTime.bloodmagic.util.Utils;
import WayofTime.bloodmagic.util.helper.TextHelper;
@ -69,16 +69,16 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
public ItemLivingArmour(EntityEquipmentSlot armorType)
{
super(ItemArmor.ArmorMaterial.IRON, 0, armorType);
setUnlocalizedName(Constants.Mod.MODID + ".livingArmour.");
setUnlocalizedName(BloodMagic.MODID + ".livingArmour.");
// setMaxDamage(250);
setMaxDamage((int) (getMaxDamage() * 1.5));
setCreativeTab(BloodMagic.tabBloodMagic);
setCreativeTab(BloodMagic.TAB_BM);
}
@Override
public void onCreated(ItemStack stack, World world, EntityPlayer player)
{
if (stack != null && !world.isRemote && stack.getItem() == ModItems.LIVING_ARMOUR_CHEST)
if (stack != null && !world.isRemote && stack.getItem() == RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST)
{
Utils.setUUID(stack);
}
@ -87,12 +87,12 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
@Override
public String getArmorTexture(ItemStack stack, Entity entity, EntityEquipmentSlot slot, String type)
{
if (this == ModItems.LIVING_ARMOUR_CHEST || this == ModItems.LIVING_ARMOUR_HELMET || this == ModItems.LIVING_ARMOUR_BOOTS)
if (this == RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST || this == RegistrarBloodMagicItems.LIVING_ARMOUR_HELMET || this == RegistrarBloodMagicItems.LIVING_ARMOUR_BOOTS)
{
return "bloodmagic:models/armor/livingArmour_layer_1.png";
}
if (this == ModItems.LIVING_ARMOUR_LEGS)
if (this == RegistrarBloodMagicItems.LIVING_ARMOUR_LEGS)
{
return "bloodmagic:models/armor/livingArmour_layer_2.png";
} else
@ -125,13 +125,13 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
double armourReduction = 0.0;
double damageAmount = 0.25;
if (this == ModItems.LIVING_ARMOUR_BOOTS || this == ModItems.LIVING_ARMOUR_HELMET)
if (this == RegistrarBloodMagicItems.LIVING_ARMOUR_BOOTS || this == RegistrarBloodMagicItems.LIVING_ARMOUR_HELMET)
{
damageAmount = 3d / 20d * 0.6;
} else if (this == ModItems.LIVING_ARMOUR_LEGS)
} else if (this == RegistrarBloodMagicItems.LIVING_ARMOUR_LEGS)
{
damageAmount = 6d / 20d * 0.6;
} else if (this == ModItems.LIVING_ARMOUR_CHEST)
} else if (this == RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST)
{
damageAmount = 0.64;
}
@ -150,7 +150,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
return new ArmorProperties(-1, 0, 0);
}
if (this == ModItems.LIVING_ARMOUR_CHEST)
if (this == RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST)
{
armourReduction = 0.24 / 0.64; // This values puts it at iron level
@ -208,22 +208,22 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
@Override
public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot)
{
if (armor.getItem() == ModItems.LIVING_ARMOUR_HELMET)
if (armor.getItem() == RegistrarBloodMagicItems.LIVING_ARMOUR_HELMET)
{
return 3;
}
if (armor.getItem() == ModItems.LIVING_ARMOUR_CHEST)
if (armor.getItem() == RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST)
{
return 8;
}
if (armor.getItem() == ModItems.LIVING_ARMOUR_LEGS)
if (armor.getItem() == RegistrarBloodMagicItems.LIVING_ARMOUR_LEGS)
{
return 6;
}
if (armor.getItem() == ModItems.LIVING_ARMOUR_BOOTS)
if (armor.getItem() == RegistrarBloodMagicItems.LIVING_ARMOUR_BOOTS)
{
return 3;
}
@ -234,7 +234,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
@Override
public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot)
{
if (this == ModItems.LIVING_ARMOUR_CHEST)
if (this == RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST)
{
int preDamage = stack.getItemDamage();
if (source.isUnblockable())
@ -286,7 +286,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
if (!stack.hasTagCompound())
return;
if (this == ModItems.LIVING_ARMOUR_CHEST)
if (this == RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST)
{
LivingArmour armour = getLivingArmourFromStack(stack);
for (Entry<String, LivingArmourUpgrade> entry : armour.upgradeMap.entrySet())
@ -333,7 +333,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
{
super.onArmorTick(world, player, stack);
if (world.isRemote && this == ModItems.LIVING_ARMOUR_CHEST)
if (world.isRemote && this == RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST)
{
if (player instanceof EntityPlayerSP) //Sanity check
{
@ -358,7 +358,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
if (LivingArmour.hasFullSet(player))
{
ItemStack chestStack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST);
LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgradeFromNBT(Constants.Mod.MODID + ".upgrade.elytra", chestStack);
LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgradeFromNBT(BloodMagic.MODID + ".upgrade.elytra", chestStack);
if (upgrade instanceof LivingArmourUpgradeElytra)
{
if (spPlayer.movementInput.jump && !spPlayer.onGround && spPlayer.motionY < 0.0D && !spPlayer.capabilities.isFlying)
@ -384,7 +384,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
}
}
if (this == ModItems.LIVING_ARMOUR_CHEST)
if (this == RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST)
{
if (!hasLivingArmour(stack))
{
@ -405,7 +405,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
@Override
public Multimap<String, AttributeModifier> getAttributeModifiers(EntityEquipmentSlot slot, ItemStack stack)
{
if (this == ModItems.LIVING_ARMOUR_CHEST && isEnabled(stack) && slot == EntityEquipmentSlot.CHEST)
if (this == RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST && isEnabled(stack) && slot == EntityEquipmentSlot.CHEST)
{
LivingArmour armour = ItemLivingArmour.getLivingArmourFromStack(stack);
@ -431,11 +431,11 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
public ModelResourceLocation getModelLocation(ItemStack stack)
{
assert getCustomLocation() != null;
if (stack.getItem() == ModItems.LIVING_ARMOUR_HELMET)
if (stack.getItem() == RegistrarBloodMagicItems.LIVING_ARMOUR_HELMET)
return new ModelResourceLocation(getCustomLocation(), "armour=head");
else if (stack.getItem() == ModItems.LIVING_ARMOUR_CHEST)
else if (stack.getItem() == RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST)
return new ModelResourceLocation(getCustomLocation(), "armour=body");
else if (stack.getItem() == ModItems.LIVING_ARMOUR_LEGS)
else if (stack.getItem() == RegistrarBloodMagicItems.LIVING_ARMOUR_LEGS)
return new ModelResourceLocation(getCustomLocation(), "armour=leg");
else
return new ModelResourceLocation(getCustomLocation(), "armour=feet");
@ -446,7 +446,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
@Override
public ResourceLocation getCustomLocation()
{
return new ResourceLocation(Constants.Mod.MODID, "item/ItemLivingArmour");
return new ResourceLocation(BloodMagic.MODID, "item/ItemLivingArmour");
}
@Override

44
src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java
View file

@ -31,7 +31,7 @@ import WayofTime.bloodmagic.api.soul.EnumDemonWillType;
import WayofTime.bloodmagic.api.soul.PlayerDemonWillHandler;
import WayofTime.bloodmagic.api.util.helper.NBTHelper;
import WayofTime.bloodmagic.client.IMeshProvider;
import WayofTime.bloodmagic.registry.ModItems;
import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
@ -56,15 +56,15 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes
public ItemSentientArmour(EntityEquipmentSlot armorType)
{
super(ItemArmor.ArmorMaterial.IRON, 0, armorType);
setUnlocalizedName(Constants.Mod.MODID + ".sentientArmour.");
setUnlocalizedName(BloodMagic.MODID + ".sentientArmour.");
setMaxDamage(250);
setCreativeTab(BloodMagic.tabBloodMagic);
setCreativeTab(BloodMagic.TAB_BM);
}
@Override
public String getArmorTexture(ItemStack stack, Entity entity, EntityEquipmentSlot slot, String type)
{
if (this == ModItems.SENTIENT_ARMOUR_CHEST || this == ModItems.SENTIENT_ARMOUR_HELMET || this == ModItems.SENTIENT_ARMOUR_BOOTS)
if (this == RegistrarBloodMagicItems.SENTIENT_ARMOUR_CHEST || this == RegistrarBloodMagicItems.SENTIENT_ARMOUR_HELMET || this == RegistrarBloodMagicItems.SENTIENT_ARMOUR_BOOTS)
{
switch (this.getCurrentType(stack))
{
@ -82,7 +82,7 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes
return "bloodmagic:models/armor/sentientArmour_layer_1.png";
}
if (this == ModItems.SENTIENT_ARMOUR_LEGS)
if (this == RegistrarBloodMagicItems.SENTIENT_ARMOUR_LEGS)
{
switch (this.getCurrentType(stack))
{
@ -159,13 +159,13 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes
double armourReduction = 0.0;
double damageAmount = 0.25;
if (this == ModItems.SENTIENT_ARMOUR_BOOTS || this == ModItems.SENTIENT_ARMOUR_HELMET)
if (this == RegistrarBloodMagicItems.SENTIENT_ARMOUR_BOOTS || this == RegistrarBloodMagicItems.SENTIENT_ARMOUR_HELMET)
{
damageAmount = 3d / 20d * 0.6;
} else if (this == ModItems.SENTIENT_ARMOUR_LEGS)
} else if (this == RegistrarBloodMagicItems.SENTIENT_ARMOUR_LEGS)
{
damageAmount = 6d / 20d * 0.6;
} else if (this == ModItems.SENTIENT_ARMOUR_CHEST)
} else if (this == RegistrarBloodMagicItems.SENTIENT_ARMOUR_CHEST)
{
damageAmount = 0.64;
}
@ -184,7 +184,7 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes
return new ArmorProperties(-1, 0, 0);
}
if (this == ModItems.SENTIENT_ARMOUR_CHEST)
if (this == RegistrarBloodMagicItems.SENTIENT_ARMOUR_CHEST)
{
armourReduction = 0.24 / 0.64; // This values puts it at iron level
@ -230,22 +230,22 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes
@Override
public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot)
{
if (armor.getItem() == ModItems.SENTIENT_ARMOUR_HELMET)
if (armor.getItem() == RegistrarBloodMagicItems.SENTIENT_ARMOUR_HELMET)
{
return 3;
}
if (armor.getItem() == ModItems.SENTIENT_ARMOUR_CHEST)
if (armor.getItem() == RegistrarBloodMagicItems.SENTIENT_ARMOUR_CHEST)
{
return 8;
}
if (armor.getItem() == ModItems.SENTIENT_ARMOUR_LEGS)
if (armor.getItem() == RegistrarBloodMagicItems.SENTIENT_ARMOUR_LEGS)
{
return 6;
}
if (armor.getItem() == ModItems.SENTIENT_ARMOUR_BOOTS)
if (armor.getItem() == RegistrarBloodMagicItems.SENTIENT_ARMOUR_BOOTS)
{
return 3;
}
@ -329,13 +329,13 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes
public ModelResourceLocation getModelLocation(ItemStack stack)
{
assert getCustomLocation() != null;
EnumDemonWillType type = ((ItemSentientArmour) ModItems.SENTIENT_ARMOUR_HELMET).getCurrentType(stack);
EnumDemonWillType type = ((ItemSentientArmour) RegistrarBloodMagicItems.SENTIENT_ARMOUR_HELMET).getCurrentType(stack);
String additional = "_" + type.getName().toLowerCase();
if (stack.getItem() == ModItems.SENTIENT_ARMOUR_HELMET)
if (stack.getItem() == RegistrarBloodMagicItems.SENTIENT_ARMOUR_HELMET)
return new ModelResourceLocation(getCustomLocation(), "armour=head" + additional);
else if (stack.getItem() == ModItems.SENTIENT_ARMOUR_CHEST)
else if (stack.getItem() == RegistrarBloodMagicItems.SENTIENT_ARMOUR_CHEST)
return new ModelResourceLocation(getCustomLocation(), "armour=body" + additional);
else if (stack.getItem() == ModItems.SENTIENT_ARMOUR_LEGS)
else if (stack.getItem() == RegistrarBloodMagicItems.SENTIENT_ARMOUR_LEGS)
return new ModelResourceLocation(getCustomLocation(), "armour=leg" + additional);
else
return new ModelResourceLocation(getCustomLocation(), "armour=feet" + additional);
@ -346,7 +346,7 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes
@Override
public ResourceLocation getCustomLocation()
{
return new ResourceLocation(Constants.Mod.MODID, "item/ItemSentientArmour");
return new ResourceLocation(BloodMagic.MODID, "item/ItemSentientArmour");
}
@Override
@ -440,10 +440,10 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes
ItemStack bootsStack = player.getItemStackFromSlot(EntityEquipmentSlot.FEET);
{
ItemStack omegaHelmetStack = ((ItemSentientArmour) ModItems.SENTIENT_ARMOUR_HELMET).getSubstituteStack(type, will, helmetStack);
ItemStack omegaChestStack = ((ItemSentientArmour) ModItems.SENTIENT_ARMOUR_CHEST).getSubstituteStack(type, will, chestStack);
ItemStack omegaLeggingsStack = ((ItemSentientArmour) ModItems.SENTIENT_ARMOUR_LEGS).getSubstituteStack(type, will, leggingsStack);
ItemStack omegaBootsStack = ((ItemSentientArmour) ModItems.SENTIENT_ARMOUR_BOOTS).getSubstituteStack(type, will, bootsStack);
ItemStack omegaHelmetStack = ((ItemSentientArmour) RegistrarBloodMagicItems.SENTIENT_ARMOUR_HELMET).getSubstituteStack(type, will, helmetStack);
ItemStack omegaChestStack = ((ItemSentientArmour) RegistrarBloodMagicItems.SENTIENT_ARMOUR_CHEST).getSubstituteStack(type, will, chestStack);
ItemStack omegaLeggingsStack = ((ItemSentientArmour) RegistrarBloodMagicItems.SENTIENT_ARMOUR_LEGS).getSubstituteStack(type, will, leggingsStack);
ItemStack omegaBootsStack = ((ItemSentientArmour) RegistrarBloodMagicItems.SENTIENT_ARMOUR_BOOTS).getSubstituteStack(type, will, bootsStack);
player.setItemStackToSlot(EntityEquipmentSlot.HEAD, omegaHelmetStack);
player.setItemStackToSlot(EntityEquipmentSlot.CHEST, omegaChestStack);

4
src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java
View file

@ -33,8 +33,8 @@ public class ItemPackSacrifice extends ItemArmor implements IAltarManipulator, I
{
super(ArmorMaterial.CHAIN, 0, EntityEquipmentSlot.CHEST);
setUnlocalizedName(Constants.Mod.MODID + ".pack.sacrifice");
setCreativeTab(BloodMagic.tabBloodMagic);
setUnlocalizedName(BloodMagic.MODID + ".pack.sacrifice");
setCreativeTab(BloodMagic.TAB_BM);
}
@Override

4
src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java
View file

@ -49,8 +49,8 @@ public class ItemPackSelfSacrifice extends ItemArmor implements IAltarManipulato
{
super(ArmorMaterial.CHAIN, 0, EntityEquipmentSlot.CHEST);
setUnlocalizedName(Constants.Mod.MODID + ".pack.selfSacrifice");
setCreativeTab(BloodMagic.tabBloodMagic);
setUnlocalizedName(BloodMagic.MODID + ".pack.selfSacrifice");
setCreativeTab(BloodMagic.TAB_BM);
}
@Override

5
src/main/java/WayofTime/bloodmagic/item/routing/ItemFluidRouterFilter.java
View file

@ -17,7 +17,6 @@ import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.client.IVariantProvider;
import WayofTime.bloodmagic.item.inventory.ItemInventory;
import WayofTime.bloodmagic.routing.IFluidFilter;
@ -33,9 +32,9 @@ public class ItemFluidRouterFilter extends Item implements IFluidFilterProvider,
{
super();
setUnlocalizedName(Constants.Mod.MODID + ".fluidFilter.");
setUnlocalizedName(BloodMagic.MODID + ".fluidFilter.");
setHasSubtypes(true);
setCreativeTab(BloodMagic.tabBloodMagic);
setCreativeTab(BloodMagic.TAB_BM);
}
@Override

4
src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java
View file

@ -32,9 +32,9 @@ public class ItemNodeRouter extends Item implements INodeRenderer, IVariantProvi
{
public ItemNodeRouter()
{
setUnlocalizedName(Constants.Mod.MODID + ".nodeRouter");
setUnlocalizedName(BloodMagic.MODID + ".nodeRouter");
setMaxStackSize(1);
setCreativeTab(BloodMagic.tabBloodMagic);
setCreativeTab(BloodMagic.TAB_BM);
}
@Override

5
src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java
View file

@ -17,7 +17,6 @@ import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.client.IVariantProvider;
import WayofTime.bloodmagic.item.inventory.ItemInventory;
import WayofTime.bloodmagic.routing.DefaultItemFilter;
@ -37,9 +36,9 @@ public class ItemRouterFilter extends Item implements IItemFilterProvider, IVari
{
super();
setUnlocalizedName(Constants.Mod.MODID + ".itemFilter.");
setUnlocalizedName(BloodMagic.MODID + ".itemFilter.");
setHasSubtypes(true);
setCreativeTab(BloodMagic.tabBloodMagic);
setCreativeTab(BloodMagic.TAB_BM);
}
@Override

6
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilAir.java
View file

@ -48,9 +48,9 @@ public class ItemSigilAir extends ItemSigilBase implements ISentientSwordEffectP
wantedVelocity += (1 + amplifier) * (0.35);
}
player.motionX = vec.xCoord * wantedVelocity;
player.motionY = vec.yCoord * wantedVelocity;
player.motionZ = vec.zCoord * wantedVelocity;
player.motionX = vec.x * wantedVelocity;
player.motionY = vec.y * wantedVelocity;
player.motionZ = vec.z * wantedVelocity;
world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.BLOCKS, 0.5F, 2.6F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.8F);
}

5
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java
View file

@ -17,7 +17,6 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.client.IVariantProvider;
import WayofTime.bloodmagic.util.helper.TextHelper;
@ -31,8 +30,8 @@ public class ItemSigilBase extends ItemSigil implements IVariantProvider
{
super(lpUsed);
setUnlocalizedName(Constants.Mod.MODID + ".sigil." + name);
setCreativeTab(BloodMagic.tabBloodMagic);
setUnlocalizedName(BloodMagic.MODID + ".sigil." + name);
setCreativeTab(BloodMagic.TAB_BM);
this.name = name;
this.tooltipBase = "tooltip.bloodmagic.sigil." + name + ".";

4
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java
View file

@ -15,7 +15,7 @@ import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.util.helper.NBTHelper;
import WayofTime.bloodmagic.api.util.helper.NetworkHelper;
import WayofTime.bloodmagic.entity.projectile.EntityBloodLight;
import WayofTime.bloodmagic.registry.ModBlocks;
import WayofTime.bloodmagic.registry.RegistrarBloodMagicBlocks;
public class ItemSigilBloodLight extends ItemSigilBase
{
@ -51,7 +51,7 @@ public class ItemSigilBloodLight extends ItemSigilBase
if (world.isAirBlock(blockPos))
{
world.setBlockState(blockPos, ModBlocks.BLOOD_LIGHT.getDefaultState());
world.setBlockState(blockPos, RegistrarBloodMagicBlocks.BLOOD_LIGHT.getDefaultState());
if (!world.isRemote)
NetworkHelper.getSoulNetwork(getOwnerUUID(stack)).syphonAndDamage(player, getLpUsed());
resetCooldown(stack);

2
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java
View file

@ -61,7 +61,7 @@ public class ItemSigilGreenGrove extends ItemSigilToggleableBase
BlockPos blockPos = new BlockPos(ix, iy, iz);
Block block = worldIn.getBlockState(blockPos).getBlock();
if (!BloodMagicAPI.getGreenGroveBlacklist().contains(block))
if (!BloodMagicAPI.greenGroveBlacklist.contains(block))
{
if (block instanceof IPlantable || block instanceof IGrowable)
{

6
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilPhantomBridge.java
View file

@ -6,14 +6,12 @@ import java.util.Map;
import WayofTime.bloodmagic.api.util.helper.PlayerHelper;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ActionResult;
import net.minecraft.util.EnumActionResult;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import org.apache.commons.lang3.tuple.Pair;
import WayofTime.bloodmagic.registry.ModBlocks;
import WayofTime.bloodmagic.registry.RegistrarBloodMagicBlocks;
public class ItemSigilPhantomBridge extends ItemSigilToggleableBase
{
@ -88,7 +86,7 @@ public class ItemSigilPhantomBridge extends ItemSigilToggleableBase
BlockPos blockPos = new BlockPos(ix + posX, posY + verticalOffset, iz + posZ);
if (world.isAirBlock(blockPos))
world.setBlockState(blockPos, ModBlocks.PHANTOM_BLOCK.getDefaultState());
world.setBlockState(blockPos, RegistrarBloodMagicBlocks.PHANTOM.getDefaultState());
}
}

6
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java
View file

@ -4,9 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.impl.ItemSigilToggleable;
import WayofTime.bloodmagic.api.util.helper.NBTHelper;
import WayofTime.bloodmagic.api.util.helper.PlayerHelper;
import WayofTime.bloodmagic.client.IMeshProvider;
import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable;
@ -32,8 +30,8 @@ public class ItemSigilToggleableBase extends ItemSigilToggleable implements IMes
{
super(lpUsed);
setUnlocalizedName(Constants.Mod.MODID + ".sigil." + name);
setCreativeTab(BloodMagic.tabBloodMagic);
setUnlocalizedName(BloodMagic.MODID + ".sigil." + name);
setCreativeTab(BloodMagic.TAB_BM);
this.name = name;
this.tooltipBase = "tooltip.bloodmagic.sigil." + name + ".";

4
src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java
View file

@ -30,8 +30,8 @@ public class ItemMonsterSoul extends Item implements IDemonWill, IVariantProvide
{
super();
setUnlocalizedName(Constants.Mod.MODID + ".monsterSoul.");
setCreativeTab(BloodMagic.tabBloodMagic);
setUnlocalizedName(BloodMagic.MODID + ".monsterSoul.");
setCreativeTab(BloodMagic.TAB_BM);
setHasSubtypes(true);
setMaxStackSize(1);
}

5
src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java
View file

@ -12,7 +12,6 @@ import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.soul.EnumDemonWillType;
import WayofTime.bloodmagic.api.soul.PlayerDemonWillHandler;
import WayofTime.bloodmagic.item.armour.ItemSentientArmour;
@ -23,8 +22,8 @@ public class ItemSentientArmourGem extends Item
{
super();
setCreativeTab(BloodMagic.tabBloodMagic);
setUnlocalizedName(Constants.Mod.MODID + ".sentientArmourGem");
setCreativeTab(BloodMagic.TAB_BM);
setUnlocalizedName(BloodMagic.MODID + ".sentientArmourGem");
setMaxStackSize(1);
}

10
src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java
View file

@ -40,7 +40,7 @@ import WayofTime.bloodmagic.api.util.helper.NBTHelper;
import WayofTime.bloodmagic.client.IMeshProvider;
import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionMultiWill;
import WayofTime.bloodmagic.entity.mob.EntitySentientSpecter;
import WayofTime.bloodmagic.registry.ModItems;
import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
import WayofTime.bloodmagic.util.helper.TextHelper;
import com.google.common.collect.HashMultimap;
@ -80,8 +80,8 @@ public class ItemSentientAxe extends ItemAxe implements IDemonWillWeapon, IMeshP
setMaxDamage(getMaxDamage() * 2);
// super(ModItems.soulToolMaterial);
setUnlocalizedName(Constants.Mod.MODID + ".sentientAxe");
setCreativeTab(BloodMagic.tabBloodMagic);
setUnlocalizedName(BloodMagic.MODID + ".sentientAxe");
setCreativeTab(BloodMagic.TAB_BM);
}
@Override
@ -100,7 +100,7 @@ public class ItemSentientAxe extends ItemAxe implements IDemonWillWeapon, IMeshP
@Override
public boolean getIsRepairable(ItemStack toRepair, ItemStack repair)
{
return ModItems.ITEM_DEMON_CRYSTAL == repair.getItem() || super.getIsRepairable(toRepair, repair);
return RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL == repair.getItem() || super.getIsRepairable(toRepair, repair);
}
public void recalculatePowers(ItemStack stack, World world, EntityPlayer player)
@ -372,7 +372,7 @@ public class ItemSentientAxe extends ItemAxe implements IDemonWillWeapon, IMeshP
double willModifier = killedEntity instanceof EntitySlime ? 0.67 : 1;
IDemonWill soul = ((IDemonWill) ModItems.MONSTER_SOUL);
IDemonWill soul = ((IDemonWill) RegistrarBloodMagicItems.MONSTER_SOUL);
EnumDemonWillType type = this.getCurrentType(stack);

12
src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java
View file

@ -31,7 +31,7 @@ import WayofTime.bloodmagic.api.soul.PlayerDemonWillHandler;
import WayofTime.bloodmagic.api.util.helper.NBTHelper;
import WayofTime.bloodmagic.entity.mob.EntitySentientSpecter;
import WayofTime.bloodmagic.entity.projectile.EntitySentientArrow;
import WayofTime.bloodmagic.registry.ModItems;
import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
import java.util.Locale;
@ -47,8 +47,8 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien
public ItemSentientBow()
{
super();
setUnlocalizedName(Constants.Mod.MODID + ".sentientBow");
setCreativeTab(BloodMagic.tabBloodMagic);
setUnlocalizedName(BloodMagic.MODID + ".sentientBow");
setCreativeTab(BloodMagic.TAB_BM);
this.addPropertyOverride(new ResourceLocation("pull"), new IItemPropertyGetter()
{
@SideOnly(Side.CLIENT)
@ -60,7 +60,7 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien
} else
{
ItemStack itemstack = entityIn.getActiveItemStack();
return !itemstack.isEmpty() && itemstack.getItem() == ModItems.SENTIENT_BOW ? (float) (stack.getMaxItemUseDuration() - entityIn.getItemInUseCount()) / 20.0F : 0.0F;
return !itemstack.isEmpty() && itemstack.getItem() == RegistrarBloodMagicItems.SENTIENT_BOW ? (float) (stack.getMaxItemUseDuration() - entityIn.getItemInUseCount()) / 20.0F : 0.0F;
}
}
});
@ -77,7 +77,7 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien
@SideOnly(Side.CLIENT)
public float apply(ItemStack stack, World world, EntityLivingBase entityIn)
{
return ((ItemSentientBow) ModItems.SENTIENT_BOW).getCurrentType(stack).ordinal();
return ((ItemSentientBow) RegistrarBloodMagicItems.SENTIENT_BOW).getCurrentType(stack).ordinal();
}
});
}
@ -85,7 +85,7 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien
@Override
public boolean getIsRepairable(ItemStack toRepair, ItemStack repair)
{
return ModItems.ITEM_DEMON_CRYSTAL == repair.getItem() || super.getIsRepairable(toRepair, repair);
return RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL == repair.getItem() || super.getIsRepairable(toRepair, repair);
}
public void recalculatePowers(ItemStack stack, World world, EntityPlayer player)

10
src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java
View file

@ -40,7 +40,7 @@ import WayofTime.bloodmagic.api.util.helper.NBTHelper;
import WayofTime.bloodmagic.client.IMeshProvider;
import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionMultiWill;
import WayofTime.bloodmagic.entity.mob.EntitySentientSpecter;
import WayofTime.bloodmagic.registry.ModItems;
import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
import WayofTime.bloodmagic.util.helper.TextHelper;
import com.google.common.collect.HashMultimap;
@ -80,8 +80,8 @@ public class ItemSentientPickaxe extends ItemPickaxe implements IDemonWillWeapon
setMaxDamage(getMaxDamage() * 2);
// super(ModItems.soulToolMaterial);
setUnlocalizedName(Constants.Mod.MODID + ".sentientPickaxe");
setCreativeTab(BloodMagic.tabBloodMagic);
setUnlocalizedName(BloodMagic.MODID + ".sentientPickaxe");
setCreativeTab(BloodMagic.TAB_BM);
}
@Override
@ -100,7 +100,7 @@ public class ItemSentientPickaxe extends ItemPickaxe implements IDemonWillWeapon
@Override
public boolean getIsRepairable(ItemStack toRepair, ItemStack repair)
{
return ModItems.ITEM_DEMON_CRYSTAL == repair.getItem() ? true : super.getIsRepairable(toRepair, repair);
return RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL == repair.getItem() ? true : super.getIsRepairable(toRepair, repair);
}
public void recalculatePowers(ItemStack stack, World world, EntityPlayer player)
@ -371,7 +371,7 @@ public class ItemSentientPickaxe extends ItemPickaxe implements IDemonWillWeapon
double willModifier = killedEntity instanceof EntitySlime ? 0.67 : 1;
IDemonWill soul = ((IDemonWill) ModItems.MONSTER_SOUL);
IDemonWill soul = ((IDemonWill) RegistrarBloodMagicItems.MONSTER_SOUL);
EnumDemonWillType type = this.getCurrentType(stack);

10
src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java
View file

@ -40,7 +40,7 @@ import WayofTime.bloodmagic.api.util.helper.NBTHelper;
import WayofTime.bloodmagic.client.IMeshProvider;
import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionMultiWill;
import WayofTime.bloodmagic.entity.mob.EntitySentientSpecter;
import WayofTime.bloodmagic.registry.ModItems;
import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
import WayofTime.bloodmagic.util.helper.TextHelper;
import com.google.common.collect.HashMultimap;
@ -80,8 +80,8 @@ public class ItemSentientShovel extends ItemSpade implements IDemonWillWeapon, I
setMaxDamage(getMaxDamage() * 2);
// super(ModItems.soulToolMaterial);
setUnlocalizedName(Constants.Mod.MODID + ".sentientShovel");
setCreativeTab(BloodMagic.tabBloodMagic);
setUnlocalizedName(BloodMagic.MODID + ".sentientShovel");
setCreativeTab(BloodMagic.TAB_BM);
}
@Override
@ -100,7 +100,7 @@ public class ItemSentientShovel extends ItemSpade implements IDemonWillWeapon, I
@Override
public boolean getIsRepairable(ItemStack toRepair, ItemStack repair)
{
return ModItems.ITEM_DEMON_CRYSTAL == repair.getItem() || super.getIsRepairable(toRepair, repair);
return RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL == repair.getItem() || super.getIsRepairable(toRepair, repair);
}
public void recalculatePowers(ItemStack stack, World world, EntityPlayer player)
@ -372,7 +372,7 @@ public class ItemSentientShovel extends ItemSpade implements IDemonWillWeapon, I
double willModifier = killedEntity instanceof EntitySlime ? 0.67 : 1;
IDemonWill soul = ((IDemonWill) ModItems.MONSTER_SOUL);
IDemonWill soul = ((IDemonWill) RegistrarBloodMagicItems.MONSTER_SOUL);
EnumDemonWillType type = this.getCurrentType(stack);

12
src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java
View file

@ -38,7 +38,7 @@ import WayofTime.bloodmagic.api.util.helper.NBTHelper;
import WayofTime.bloodmagic.client.IMeshProvider;
import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionMultiWill;
import WayofTime.bloodmagic.entity.mob.EntitySentientSpecter;
import WayofTime.bloodmagic.registry.ModItems;
import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
import WayofTime.bloodmagic.util.helper.TextHelper;
import com.google.common.collect.HashMultimap;
@ -70,16 +70,16 @@ public class ItemSentientSword extends ItemSword implements IDemonWillWeapon, IM
public ItemSentientSword()
{
super(ModItems.SOUL_TOOL_MATERIAL);
super(RegistrarBloodMagicItems.SOUL_TOOL_MATERIAL);
setUnlocalizedName(Constants.Mod.MODID + ".sentientSword");
setCreativeTab(BloodMagic.tabBloodMagic);
setUnlocalizedName(BloodMagic.MODID + ".sentientSword");
setCreativeTab(BloodMagic.TAB_BM);
}
@Override
public boolean getIsRepairable(ItemStack toRepair, ItemStack repair)
{
return ModItems.ITEM_DEMON_CRYSTAL == repair.getItem() || super.getIsRepairable(toRepair, repair);
return RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL == repair.getItem() || super.getIsRepairable(toRepair, repair);
}
public void recalculatePowers(ItemStack stack, World world, EntityPlayer player)
@ -343,7 +343,7 @@ public class ItemSentientSword extends ItemSword implements IDemonWillWeapon, IM
double willModifier = killedEntity instanceof EntitySlime ? 0.67 : 1;
IDemonWill soul = ((IDemonWill) ModItems.MONSTER_SOUL);
IDemonWill soul = ((IDemonWill) RegistrarBloodMagicItems.MONSTER_SOUL);
EnumDemonWillType type = this.getCurrentType(stack);

4
src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java
View file

@ -37,10 +37,10 @@ public class ItemSoulGem extends Item implements IDemonWillGem, IMeshProvider, I
{
super();
setUnlocalizedName(Constants.Mod.MODID + ".soulGem.");
setUnlocalizedName(BloodMagic.MODID + ".soulGem.");
setHasSubtypes(true);
setMaxStackSize(1);
setCreativeTab(BloodMagic.tabBloodMagic);
setCreativeTab(BloodMagic.TAB_BM);
}
@Override

5
src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java
View file

@ -1,7 +1,6 @@
package WayofTime.bloodmagic.item.soul;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.client.IVariantProvider;
import WayofTime.bloodmagic.entity.projectile.EntitySoulSnare;
import WayofTime.bloodmagic.util.helper.TextHelper;
@ -30,8 +29,8 @@ public class ItemSoulSnare extends Item implements IVariantProvider
{
super();
setUnlocalizedName(Constants.Mod.MODID + ".soulSnare.");
setCreativeTab(BloodMagic.tabBloodMagic);
setUnlocalizedName(BloodMagic.MODID + ".soulSnare.");
setCreativeTab(BloodMagic.TAB_BM);
setHasSubtypes(true);
setMaxStackSize(16);
}