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

Almost ready for final 1.2.0 push

Browse source
This commit is contained in:
WayofTime 2014-10-13 10:33:43 -04:00
parent 4a1f13d988
commit 3d6d7bcdd6
12 changed files with 136 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

62
1.7.10/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectFullStomach.java
View file

@ -35,8 +35,8 @@ public class RitualEffectFullStomach extends RitualEffect
return;
}
double horizRange = 5;
double vertRange = 5;
double horizRange = 16;
double vertRange = 16;
List<EntityPlayer> playerList = SpellHelper.getPlayersInRange(world, x+0.5, y+0.5, z+0.5, horizRange, vertRange);
@ -72,7 +72,7 @@ public class RitualEffectFullStomach extends RitualEffect
{
FoodStats foodStats = player.getFoodStats();
float satLevel = foodStats.getSaturationLevel();
for(int i=0; i<inventory.getSizeInventory(); i++)
{
ItemStack stack = inventory.getStackInSlot(i);
@ -82,8 +82,8 @@ public class RitualEffectFullStomach extends RitualEffect
ItemFood foodItem = (ItemFood)stack.getItem();
int regularHeal = foodItem.func_150905_g(stack);
float saturatedHeal = foodItem.func_150906_h(stack);
float saturatedHeal = foodItem.func_150906_h(stack) * regularHeal * 2.0f;
if(saturatedHeal + satLevel <= 20)
{
foodStats.setFoodSaturationLevel(saturatedHeal + satLevel);
@ -109,23 +109,39 @@ public class RitualEffectFullStomach extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> animalGrowthRitual = new ArrayList();
animalGrowthRitual.add(new RitualComponent(0, 0, 2, RitualComponent.DUSK));
animalGrowthRitual.add(new RitualComponent(2, 0, 0, RitualComponent.DUSK));
animalGrowthRitual.add(new RitualComponent(0, 0, -2, RitualComponent.DUSK));
animalGrowthRitual.add(new RitualComponent(-2, 0, 0, RitualComponent.DUSK));
animalGrowthRitual.add(new RitualComponent(0, 0, 1, RitualComponent.WATER));
animalGrowthRitual.add(new RitualComponent(1, 0, 0, RitualComponent.WATER));
animalGrowthRitual.add(new RitualComponent(0, 0, -1, RitualComponent.WATER));
animalGrowthRitual.add(new RitualComponent(-1, 0, 0, RitualComponent.WATER));
animalGrowthRitual.add(new RitualComponent(1, 0, 2, RitualComponent.EARTH));
animalGrowthRitual.add(new RitualComponent(-1, 0, 2, RitualComponent.EARTH));
animalGrowthRitual.add(new RitualComponent(1, 0, -2, RitualComponent.EARTH));
animalGrowthRitual.add(new RitualComponent(-1, 0, -2, RitualComponent.EARTH));
animalGrowthRitual.add(new RitualComponent(2, 0, 1, RitualComponent.AIR));
animalGrowthRitual.add(new RitualComponent(2, 0, -1, RitualComponent.AIR));
animalGrowthRitual.add(new RitualComponent(-2, 0, 1, RitualComponent.AIR));
animalGrowthRitual.add(new RitualComponent(-2, 0, -1, RitualComponent.AIR));
return animalGrowthRitual;
ArrayList<RitualComponent> fullRitual = new ArrayList();
fullRitual.add(new RitualComponent(0, 0, 3, RitualComponent.FIRE));
fullRitual.add(new RitualComponent(0, 0, -3, RitualComponent.FIRE));
fullRitual.add(new RitualComponent(3, 0, 0, RitualComponent.FIRE));
fullRitual.add(new RitualComponent(-3, 0, 0, RitualComponent.FIRE));
fullRitual.add(new RitualComponent(1, 0, 1, RitualComponent.AIR));
fullRitual.add(new RitualComponent(1, 0, -1, RitualComponent.AIR));
fullRitual.add(new RitualComponent(-1, 0, -1, RitualComponent.AIR));
fullRitual.add(new RitualComponent(-1, 0, 1, RitualComponent.AIR));
fullRitual.add(new RitualComponent(2, 0, 1, RitualComponent.AIR));
fullRitual.add(new RitualComponent(2, 0, -1, RitualComponent.AIR));
fullRitual.add(new RitualComponent(-2, 0, -1, RitualComponent.AIR));
fullRitual.add(new RitualComponent(-2, 0, 1, RitualComponent.AIR));
fullRitual.add(new RitualComponent(1, 0, 2, RitualComponent.AIR));
fullRitual.add(new RitualComponent(1, 0, -2, RitualComponent.AIR));
fullRitual.add(new RitualComponent(-1, 0, -2, RitualComponent.AIR));
fullRitual.add(new RitualComponent(-1, 0, 2, RitualComponent.AIR));
fullRitual.add(new RitualComponent(4, 0, 4, RitualComponent.WATER));
fullRitual.add(new RitualComponent(4, 0, -4, RitualComponent.WATER));
fullRitual.add(new RitualComponent(-4, 0, -4, RitualComponent.WATER));
fullRitual.add(new RitualComponent(-4, 0, 4, RitualComponent.WATER));
fullRitual.add(new RitualComponent(4, 0, 3, RitualComponent.EARTH));
fullRitual.add(new RitualComponent(3, 0, 4, RitualComponent.EARTH));
fullRitual.add(new RitualComponent(-4, 0, 3, RitualComponent.EARTH));
fullRitual.add(new RitualComponent(3, 0, -4, RitualComponent.EARTH));
fullRitual.add(new RitualComponent(-4, 0, -3, RitualComponent.EARTH));
fullRitual.add(new RitualComponent(-3, 0, -4, RitualComponent.EARTH));
fullRitual.add(new RitualComponent(4, 0, -3, RitualComponent.EARTH));
fullRitual.add(new RitualComponent(-3, 0, 4, RitualComponent.EARTH));
return fullRitual;
}
}

7
1.7.10/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectItemSuction.java
View file

@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.block.BlockFurnace;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
@ -116,7 +117,7 @@ public class RitualEffectItemSuction extends RitualEffect
// }
// }
count++;
//count++;
ItemStack newStack = SpellHelper.insertStackIntoInventory(copyStack, tileEntity);
@ -126,6 +127,7 @@ public class RitualEffectItemSuction extends RitualEffect
if(newStack.stackSize<=0)
{
itemEntity.setDead();
itemEntity.getEntityItem().stackSize = newStack.stackSize;
}
if (newStack.stackSize > 0)
@ -134,8 +136,9 @@ public class RitualEffectItemSuction extends RitualEffect
}
if(hasReductus)
{
BlockFurnace d;
this.canDrainReagent(ritualStone, ReagentRegistry.reductusReagent, reductusDrain, true);
}
}
}
}
}

2
1.7.10/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectUnbinding.java
View file

@ -76,7 +76,7 @@ public class RitualEffectUnbinding extends RitualEffect
world.addWeatherEffect(new EntityLightningBolt(world, x - 5, y + 1, z));
world.addWeatherEffect(new EntityLightningBolt(world, x + 5, y + 1, z));
EnergyItems.checkAndSetItemOwner(itemStack, "");
EnergyItems.setItemOwner(itemStack, "");
this.canDrainReagent(ritualStone, ReagentRegistry.sanctusReagent, sanctusDrain, true);
drain = true;
ritualStone.setActive(false);