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

Getting ready for release candidate

Browse source
This commit is contained in:
WayofTime 2014-07-10 20:52:05 -04:00
parent 084e3dd348
commit 96930fc47a
18 changed files with 477 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

123
1.7.2/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectHarvest.java Normal file
View file

@ -0,0 +1,123 @@
package WayofTime.alchemicalWizardry.common.rituals;
import java.util.ArrayList;
import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.server.MinecraftServer;
import net.minecraft.world.World;
import net.minecraftforge.common.IPlantable;
import WayofTime.alchemicalWizardry.api.harvest.HarvestRegistry;
import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone;
import WayofTime.alchemicalWizardry.api.rituals.RitualComponent;
import WayofTime.alchemicalWizardry.api.rituals.RitualEffect;
import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork;
import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
public class RitualEffectHarvest extends RitualEffect
{
@Override
public void performEffect(IMasterRitualStone ritualStone)
{
String owner = ritualStone.getOwner();
World worldSave = MinecraftServer.getServer().worldServers[0];
LifeEssenceNetwork data = (LifeEssenceNetwork) worldSave.loadItemData(LifeEssenceNetwork.class, owner);
if (data == null)
{
data = new LifeEssenceNetwork(owner);
worldSave.setItemData(owner, data);
}
int currentEssence = data.currentEssence;
World world = ritualStone.getWorld();
int x = ritualStone.getXCoord();
int y = ritualStone.getYCoord();
int z = ritualStone.getZCoord();
int maxCount = 9;
if (currentEssence < this.getCostPerRefresh() * maxCount)
{
EntityPlayer entityOwner = MinecraftServer.getServer().getConfigurationManager().getPlayerForUsername(owner);
if (entityOwner == null)
{
return;
}
entityOwner.addPotionEffect(new PotionEffect(Potion.confusion.id, 80));
} else
{
if (world.getWorldTime() % 20 != 0)
{
return;
}
int flag = 0;
int range = 4;
for (int i = -range; i <= range; i++)
{
for (int j = -range; j <= range; j++)
{
for(int k = -range; k<=range; k++)
{
if(HarvestRegistry.harvestBlock(world, x + i, y + j, z + k))
{
flag++;
}
}
}
}
if (flag > 0)
{
data.currentEssence = currentEssence - this.getCostPerRefresh() * Math.min(maxCount, flag);
data.markDirty();
}
}
}
@Override
public int getCostPerRefresh()
{
return 20;
}
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> harvestRitual = new ArrayList();
harvestRitual.add(new RitualComponent(1,0,1,RitualComponent.DUSK));
harvestRitual.add(new RitualComponent(1,0,-1,RitualComponent.DUSK));
harvestRitual.add(new RitualComponent(-1,0,-1,RitualComponent.DUSK));
harvestRitual.add(new RitualComponent(-1,0,1,RitualComponent.DUSK));
harvestRitual.add(new RitualComponent(2,0,0,RitualComponent.EARTH));
harvestRitual.add(new RitualComponent(-2,0,0,RitualComponent.EARTH));
harvestRitual.add(new RitualComponent(0,0,2,RitualComponent.EARTH));
harvestRitual.add(new RitualComponent(0,0,-2,RitualComponent.EARTH));
harvestRitual.add(new RitualComponent(3,0,1,RitualComponent.EARTH));
harvestRitual.add(new RitualComponent(3,0,-1,RitualComponent.EARTH));
harvestRitual.add(new RitualComponent(-3,0,1,RitualComponent.EARTH));
harvestRitual.add(new RitualComponent(-3,0,-1,RitualComponent.EARTH));
harvestRitual.add(new RitualComponent(1,0,3,RitualComponent.EARTH));
harvestRitual.add(new RitualComponent(-1,0,3,RitualComponent.EARTH));
harvestRitual.add(new RitualComponent(1,0,-3,RitualComponent.EARTH));
harvestRitual.add(new RitualComponent(-1,0,-3,RitualComponent.EARTH));
harvestRitual.add(new RitualComponent(2,0,3,RitualComponent.WATER));
harvestRitual.add(new RitualComponent(3,0,2,RitualComponent.WATER));
harvestRitual.add(new RitualComponent(2,0,-3,RitualComponent.WATER));
harvestRitual.add(new RitualComponent(-3,0,2,RitualComponent.WATER));
harvestRitual.add(new RitualComponent(-2,0,3,RitualComponent.WATER));
harvestRitual.add(new RitualComponent(3,0,-2,RitualComponent.WATER));
harvestRitual.add(new RitualComponent(-2,0,-3,RitualComponent.WATER));
harvestRitual.add(new RitualComponent(-3,0,-2,RitualComponent.WATER));
return harvestRitual;
}
}

8
1.7.2/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectItemSuction.java
View file

@ -9,6 +9,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.server.MinecraftServer;
@ -73,7 +74,7 @@ public class RitualEffectItemSuction extends RitualEffect
entityOwner.addPotionEffect(new PotionEffect(Potion.confusion.id, 80));
} else
{
List<EntityItem> itemDropList = SpellHelper.getItemsInRange(world, x+0.5f, y+0.5f, z+0.5f, 10, 10);
List<EntityItem> itemDropList = SpellHelper.getItemsInRange(world, x+0.5f, y+0.5f, z+0.5f, range, range);
int count = 0;
@ -100,7 +101,10 @@ public class RitualEffectItemSuction extends RitualEffect
copyStack.stackSize = 0;
} else
{
if (itemStack.getItem().equals(copyStack.getItem()) && itemStack.getItemDamage() == copyStack.getItemDamage())
NBTTagCompound data1 = itemStack.getTagCompound();
NBTTagCompound data2 = copyStack.getTagCompound();
//TODO
if (itemStack.getItem().equals(copyStack.getItem()) && itemStack.getItemDamage() == copyStack.getItemDamage() && ((data1 == null && data2 == null) || (data1 != null && data1.equals(data2))))
{
int itemSize = itemStack.stackSize;
int copySize = copyStack.stackSize;