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

Update Forge + Mappings

Browse source
This commit is contained in:
Nick 2016-03-21 12:55:36 -07:00
parent aa48c540f5
commit d8fe6d21bd
13 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gradle.properties
View file

@ -2,10 +2,10 @@ mod_name=BloodMagic
package_group=com.wayoftime.bloodmagic package_group=com.wayoftime.bloodmagic
mod_version=2.0.0 mod_version=2.0.0
mc_version=1.9 mc_version=1.9
forge_version=12.16.0.1770-1.9 forge_version=12.16.0.1782-1.9
curse_id=224791 curse_id=224791
mappings_version=snapshot_20160312 mappings_version=snapshot_20160321
jei_version=3.0.0.158 jei_version=3.0.0.158
waila_version=1.6.0-B3 waila_version=1.6.0-B3

2
src/main/java/WayofTime/bloodmagic/block/BlockBloodRune.java
View file

@ -24,7 +24,7 @@ public class BlockBloodRune extends BlockString implements IVariantProvider
setUnlocalizedName(Constants.Mod.MODID + ".rune."); setUnlocalizedName(Constants.Mod.MODID + ".rune.");
setRegistryName(Constants.BloodMagicBlock.BLOOD_RUNE.getRegName()); setRegistryName(Constants.BloodMagicBlock.BLOOD_RUNE.getRegName());
setCreativeTab(BloodMagic.tabBloodMagic); setCreativeTab(BloodMagic.tabBloodMagic);
setStepSound(SoundType.STONE); setSoundType(SoundType.STONE);
setHardness(2.0F); setHardness(2.0F);
setResistance(5.0F); setResistance(5.0F);
setHarvestLevel("pickaxe", 2); setHarvestLevel("pickaxe", 2);

2
src/main/java/WayofTime/bloodmagic/block/BlockBloodStoneBrick.java
View file

@ -26,7 +26,7 @@ public class BlockBloodStoneBrick extends BlockString implements IVariantProvide
setCreativeTab(BloodMagic.tabBloodMagic); setCreativeTab(BloodMagic.tabBloodMagic);
setHardness(2.0F); setHardness(2.0F);
setResistance(5.0F); setResistance(5.0F);
setStepSound(SoundType.STONE); setSoundType(SoundType.STONE);
setHarvestLevel("pickaxe", 2); setHarvestLevel("pickaxe", 2);
} }

2
src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java
View file

@ -36,7 +36,7 @@ public class BlockBloodTank extends BlockContainer
setRegistryName(Constants.BloodMagicBlock.BLOOD_TANK.getRegName()); setRegistryName(Constants.BloodMagicBlock.BLOOD_TANK.getRegName());
setHardness(2.0F); setHardness(2.0F);
setResistance(5.0F); setResistance(5.0F);
setStepSound(SoundType.GLASS); setSoundType(SoundType.GLASS);
setHarvestLevel("pickaxe", 1); setHarvestLevel("pickaxe", 1);
setCreativeTab(BloodMagic.tabBloodMagic); setCreativeTab(BloodMagic.tabBloodMagic);
} }

2
src/main/java/WayofTime/bloodmagic/block/BlockCrystal.java
View file

@ -24,7 +24,7 @@ public class BlockCrystal extends BlockString implements IVariantProvider
setUnlocalizedName(Constants.Mod.MODID + ".crystal."); setUnlocalizedName(Constants.Mod.MODID + ".crystal.");
setRegistryName(Constants.BloodMagicBlock.CRYSTAL.getRegName()); setRegistryName(Constants.BloodMagicBlock.CRYSTAL.getRegName());
setCreativeTab(BloodMagic.tabBloodMagic); setCreativeTab(BloodMagic.tabBloodMagic);
setStepSound(SoundType.STONE); setSoundType(SoundType.STONE);
setHardness(2.0F); setHardness(2.0F);
setResistance(5.0F); setResistance(5.0F);
setHarvestLevel("pickaxe", 2); setHarvestLevel("pickaxe", 2);

2
src/main/java/WayofTime/bloodmagic/block/BlockPath.java
View file

@ -31,7 +31,7 @@ public class BlockPath extends BlockString implements IIncensePath, IVariantProv
setCreativeTab(BloodMagic.tabBloodMagic); setCreativeTab(BloodMagic.tabBloodMagic);
setHardness(2.0F); setHardness(2.0F);
setResistance(5.0F); setResistance(5.0F);
setStepSound(SoundType.STONE); setSoundType(SoundType.STONE);
setHarvestLevel("axe", 0, getStateFromMeta(0)); setHarvestLevel("axe", 0, getStateFromMeta(0));
setHarvestLevel("axe", 0, getStateFromMeta(1)); setHarvestLevel("axe", 0, getStateFromMeta(1));

2
src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java
View file

@ -43,7 +43,7 @@ public class BlockRitualController extends BlockStringContainer implements IVari
setUnlocalizedName(Constants.Mod.MODID + ".stone.ritual."); setUnlocalizedName(Constants.Mod.MODID + ".stone.ritual.");
setRegistryName(Constants.BloodMagicBlock.RITUAL_CONTROLLER.getRegName()); setRegistryName(Constants.BloodMagicBlock.RITUAL_CONTROLLER.getRegName());
setCreativeTab(BloodMagic.tabBloodMagic); setCreativeTab(BloodMagic.tabBloodMagic);
setStepSound(SoundType.STONE); setSoundType(SoundType.STONE);
setHardness(2.0F); setHardness(2.0F);
setResistance(5.0F); setResistance(5.0F);
setHarvestLevel("pickaxe", 2); setHarvestLevel("pickaxe", 2);

2
src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java
View file

@ -31,7 +31,7 @@ public class BlockRitualStone extends BlockString implements IRitualStone, IVari
setUnlocalizedName(Constants.Mod.MODID + ".ritualStone."); setUnlocalizedName(Constants.Mod.MODID + ".ritualStone.");
setRegistryName(Constants.BloodMagicBlock.RITUAL_STONE.getRegName()); setRegistryName(Constants.BloodMagicBlock.RITUAL_STONE.getRegName());
setCreativeTab(BloodMagic.tabBloodMagic); setCreativeTab(BloodMagic.tabBloodMagic);
setStepSound(SoundType.STONE); setSoundType(SoundType.STONE);
setHardness(2.0F); setHardness(2.0F);
setResistance(5.0F); setResistance(5.0F);
setHarvestLevel("pickaxe", 2); setHarvestLevel("pickaxe", 2);

2
src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java
View file

@ -38,7 +38,7 @@ public class BlockSoulForge extends BlockContainer implements IVariantProvider
setRegistryName(Constants.BloodMagicBlock.SOUL_FORGE.getRegName()); setRegistryName(Constants.BloodMagicBlock.SOUL_FORGE.getRegName());
setHardness(2.0F); setHardness(2.0F);
setResistance(5.0F); setResistance(5.0F);
setStepSound(SoundType.METAL); setSoundType(SoundType.METAL);
setHarvestLevel("pickaxe", 1); setHarvestLevel("pickaxe", 1);
setCreativeTab(BloodMagic.tabBloodMagic); setCreativeTab(BloodMagic.tabBloodMagic);
} }

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

@ -76,20 +76,20 @@ public class ItemSentientBow extends ItemBow
itemstack = new ItemStack(Items.arrow); itemstack = new ItemStack(Items.arrow);
} }
float f = func_185059_b(i); float arrowVelocity = getArrowVelocity(i);
if ((double) f >= 0.1D) if ((double) arrowVelocity >= 0.1D)
{ {
boolean flag1 = flag && itemstack.getItem() instanceof ItemArrow; //Forge: Fix consuming custom arrows. boolean flag1 = flag && itemstack.getItem() instanceof ItemArrow; //Forge: Fix consuming custom arrows.
if (!worldIn.isRemote) if (!worldIn.isRemote)
{ {
//Need to do some stuffs //Need to do some stuffs
ItemArrow itemarrow = (ItemArrow) ((ItemArrow) (itemstack.getItem() instanceof ItemArrow ? itemstack.getItem() : Items.arrow)); ItemArrow itemarrow = ((ItemArrow) (itemstack.getItem() instanceof ItemArrow ? itemstack.getItem() : Items.arrow));
EntityArrow entityarrow = itemarrow.makeTippedArrow(worldIn, itemstack, entityplayer); EntityArrow entityarrow = itemarrow.createArrow(worldIn, itemstack, entityplayer);
entityarrow.func_184547_a(entityplayer, entityplayer.rotationPitch, entityplayer.rotationYaw, 0.0F, f * 3.0F, 1.0F); entityarrow.func_184547_a(entityplayer, entityplayer.rotationPitch, entityplayer.rotationYaw, 0.0F, arrowVelocity * 3.0F, 1.0F);
if (f == 1.0F) if (arrowVelocity == 1.0F)
{ {
entityarrow.setIsCritical(true); entityarrow.setIsCritical(true);
} }
@ -123,7 +123,7 @@ public class ItemSentientBow extends ItemBow
worldIn.spawnEntityInWorld(entityarrow); worldIn.spawnEntityInWorld(entityarrow);
} }
worldIn.playSound((EntityPlayer) null, entityplayer.posX, entityplayer.posY, entityplayer.posZ, SoundEvents.entity_arrow_shoot, SoundCategory.NEUTRAL, 1.0F, 1.0F / (itemRand.nextFloat() * 0.4F + 1.2F) + f * 0.5F); worldIn.playSound(null, entityplayer.posX, entityplayer.posY, entityplayer.posZ, SoundEvents.entity_arrow_shoot, SoundCategory.NEUTRAL, 1.0F, 1.0F / (itemRand.nextFloat() * 0.4F + 1.2F) + arrowVelocity * 0.5F);
if (!flag1) if (!flag1)
{ {
@ -135,7 +135,7 @@ public class ItemSentientBow extends ItemBow
} }
} }
entityplayer.addStat(StatList.func_188057_b(this)); entityplayer.addStat(StatList.getObjectUseStats(this));
} }
} }
} }
@ -143,10 +143,10 @@ public class ItemSentientBow extends ItemBow
protected ItemStack getFiredArrow(EntityPlayer player) protected ItemStack getFiredArrow(EntityPlayer player)
{ {
if (this.func_185058_h_(player.getHeldItem(EnumHand.OFF_HAND))) if (this.isArrow(player.getHeldItem(EnumHand.OFF_HAND)))
{ {
return player.getHeldItem(EnumHand.OFF_HAND); return player.getHeldItem(EnumHand.OFF_HAND);
} else if (this.func_185058_h_(player.getHeldItem(EnumHand.MAIN_HAND))) } else if (this.isArrow(player.getHeldItem(EnumHand.MAIN_HAND)))
{ {
return player.getHeldItem(EnumHand.MAIN_HAND); return player.getHeldItem(EnumHand.MAIN_HAND);
} else } else
@ -155,7 +155,7 @@ public class ItemSentientBow extends ItemBow
{ {
ItemStack itemstack = player.inventory.getStackInSlot(i); ItemStack itemstack = player.inventory.getStackInSlot(i);
if (this.func_185058_h_(itemstack)) if (this.isArrow(itemstack))
{ {
return itemstack; return itemstack;
} }

2
src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java
View file

@ -60,7 +60,7 @@ public class ClientProxy extends CommonProxy
renderHelper = new InventoryRenderHelper(Constants.Mod.DOMAIN); renderHelper = new InventoryRenderHelper(Constants.Mod.DOMAIN);
renderHelperV2 = new InventoryRenderHelperV2(Constants.Mod.DOMAIN); renderHelperV2 = new InventoryRenderHelperV2(Constants.Mod.DOMAIN);
OBJLoader.instance.addDomain(Constants.Mod.MODID); OBJLoader.INSTANCE.addDomain(Constants.Mod.MODID);
ModBlocks.initRenders(); ModBlocks.initRenders();
ModItems.initRenders(); ModItems.initRenders();

6
src/main/java/WayofTime/bloodmagic/tile/container/ContainerItemRoutingNode.java
View file

@ -59,7 +59,7 @@ public class ContainerItemRoutingNode extends Container
* Overridden in order to handle ghost item slots. * Overridden in order to handle ghost item slots.
*/ */
@Override @Override
public ItemStack func_184996_a(int slotId, int dragType, ClickType clickTypeIn, EntityPlayer player) public ItemStack slotClick(int slotId, int dragType, ClickType clickTypeIn, EntityPlayer player)
{ {
InventoryPlayer inventoryPlayer = player.inventory; InventoryPlayer inventoryPlayer = player.inventory;
// if (!player.worldObj.isRemote) // if (!player.worldObj.isRemote)
@ -87,7 +87,7 @@ public class ContainerItemRoutingNode extends Container
{ {
if (!((SlotGhostItem) slot).canBeAccessed()) if (!((SlotGhostItem) slot).canBeAccessed())
{ {
return super.func_184996_a(slotId, dragType, clickTypeIn, player); return super.slotClick(slotId, dragType, clickTypeIn, player);
} }
if (slotStack != null && Utils.canCombine(slotStack, heldStack)) if (slotStack != null && Utils.canCombine(slotStack, heldStack))
{ {
@ -140,7 +140,7 @@ public class ContainerItemRoutingNode extends Container
} }
} }
return super.func_184996_a(slotId, dragType, clickTypeIn, player); return super.slotClick(slotId, dragType, clickTypeIn, player);
} }
@Override @Override

2
src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java
View file

@ -644,7 +644,7 @@ public class EventHandler
for (int n = 0; n < numberExtra; n++) for (int n = 0; n < numberExtra; n++)
{ {
ItemArrow itemarrow = (ItemArrow) Items.arrow; ItemArrow itemarrow = (ItemArrow) Items.arrow;
EntityArrow entityarrow = itemarrow.makeTippedArrow(world, new ItemStack(Items.arrow), player); EntityArrow entityarrow = itemarrow.createArrow(world, new ItemStack(Items.arrow), player);
double velocityModifier = 0.6 * f; double velocityModifier = 0.6 * f;
entityarrow.motionX += (random.nextDouble() - 0.5) * velocityModifier; entityarrow.motionX += (random.nextDouble() - 0.5) * velocityModifier;