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

Move binding back to PIE

Browse source 
BM will now only load with Forge 1840+ as that is the version that PIE was re-implemented. Set dependency to avoid crashes. Also updated JEI version so it wouldn't crash with new Forge.
This commit is contained in:
Nick 2016-04-04 19:23:06 -07:00
parent b0b61798fe
commit 794ac6a7a2
8 changed files with 26 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -14,7 +14,6 @@ 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.DinnerBeforeDessert;
import WayofTime.bloodmagic.api.iface.IBindable;
import WayofTime.bloodmagic.api.orb.BloodOrb;
import WayofTime.bloodmagic.api.orb.IBloodOrb;
@ -55,9 +54,6 @@ public class ItemBloodOrb extends ItemBindableBase implements IBloodOrb, IBindab
if (world == null)
return super.onItemRightClick(stack, null, player, hand);
super.onItemRightClick(stack, world, player, hand);
DinnerBeforeDessert.setOrbTier(player, stack);
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);

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

@ -3,7 +3,6 @@ package WayofTime.bloodmagic.item;
import java.util.ArrayList;
import java.util.List;
import WayofTime.bloodmagic.api.DinnerBeforeDessert;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.ItemMeshDefinition;
import net.minecraft.entity.EntityLivingBase;
@ -54,8 +53,6 @@ public class ItemBoundSword extends ItemSword implements IBindable, IActivatable
@Override
public ActionResult<ItemStack> onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand)
{
DinnerBeforeDessert.bindMe(world, player, stack);
if (player.isSneaking())
setActivatedState(stack, !getActivated(stack));

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

@ -6,7 +6,6 @@ import java.util.Map;
import java.util.Set;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.DinnerBeforeDessert;
import WayofTime.bloodmagic.api.util.helper.PlayerHelper;
import com.google.common.base.Strings;
import lombok.Getter;
@ -114,8 +113,6 @@ public class ItemBoundTool extends ItemTool implements IBindable, IActivatable
@Override
public ActionResult<ItemStack> onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand)
{
DinnerBeforeDessert.bindMe(world, player, stack);
if (player.isSneaking())
setActivatedState(stack, !getActivated(stack));