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/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);
}