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

Finished TileEntities

Browse source
This commit is contained in:
Arcaratus 2015-07-30 10:21:53 -04:00
parent cfed9f5ab3
commit b2f7ec6030
36 changed files with 183 additions and 233 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectAutoAlchemy.java
View file

@ -18,7 +18,7 @@ import WayofTime.alchemicalWizardry.api.rituals.RitualComponent;
import WayofTime.alchemicalWizardry.api.rituals.RitualEffect;
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
import WayofTime.alchemicalWizardry.api.tile.IBloodAltar;
import WayofTime.alchemicalWizardry.common.tileEntity.TEWritingTable;
import WayofTime.alchemicalWizardry.common.tileEntity.TEChemistrySet;
public class RitualEffectAutoAlchemy extends RitualEffect
{
@ -60,7 +60,7 @@ public class RitualEffectAutoAlchemy extends RitualEffect
ItemStack[] recipe = AlchemyRecipeRegistry.getRecipeForItemStack(targetStack);
if (recipe != null)
{
TEWritingTable alchemyEntity;
TEChemistrySet alchemyEntity;
IInventory outputInv = null;
IInventory inputInv1 = null;
IInventory inputInv2 = null;
@ -70,63 +70,63 @@ public class RitualEffectAutoAlchemy extends RitualEffect
TileEntity eastEntity = world.getTileEntity(x + 1, y, z);
TileEntity westEntity = world.getTileEntity(x - 1, y, z);
if (northEntity instanceof TEWritingTable)
if (northEntity instanceof TEChemistrySet)
{
alchemyEntity = (TEWritingTable) northEntity;
if (southEntity instanceof IInventory && !(southEntity instanceof TEWritingTable))
alchemyEntity = (TEChemistrySet) northEntity;
if (southEntity instanceof IInventory && !(southEntity instanceof TEChemistrySet))
{
outputInv = (IInventory) southEntity;
}
if (eastEntity instanceof IInventory && !(eastEntity instanceof TEWritingTable))
if (eastEntity instanceof IInventory && !(eastEntity instanceof TEChemistrySet))
{
inputInv1 = (IInventory) eastEntity;
}
if (westEntity instanceof IInventory && !(westEntity instanceof TEWritingTable))
if (westEntity instanceof IInventory && !(westEntity instanceof TEChemistrySet))
{
inputInv2 = (IInventory) westEntity;
}
} else if (southEntity instanceof TEWritingTable)
} else if (southEntity instanceof TEChemistrySet)
{
alchemyEntity = (TEWritingTable) southEntity;
if (northEntity instanceof IInventory && !(northEntity instanceof TEWritingTable))
alchemyEntity = (TEChemistrySet) southEntity;
if (northEntity instanceof IInventory && !(northEntity instanceof TEChemistrySet))
{
outputInv = (IInventory) northEntity;
}
if (eastEntity instanceof IInventory && !(eastEntity instanceof TEWritingTable))
if (eastEntity instanceof IInventory && !(eastEntity instanceof TEChemistrySet))
{
inputInv1 = (IInventory) eastEntity;
}
if (westEntity instanceof IInventory && !(westEntity instanceof TEWritingTable))
if (westEntity instanceof IInventory && !(westEntity instanceof TEChemistrySet))
{
inputInv2 = (IInventory) westEntity;
}
} else if (eastEntity instanceof TEWritingTable)
} else if (eastEntity instanceof TEChemistrySet)
{
alchemyEntity = (TEWritingTable) eastEntity;
if (westEntity instanceof IInventory && !(westEntity instanceof TEWritingTable))
alchemyEntity = (TEChemistrySet) eastEntity;
if (westEntity instanceof IInventory && !(westEntity instanceof TEChemistrySet))
{
outputInv = (IInventory) westEntity;
}
if (northEntity instanceof IInventory && !(northEntity instanceof TEWritingTable))
if (northEntity instanceof IInventory && !(northEntity instanceof TEChemistrySet))
{
inputInv1 = (IInventory) northEntity;
}
if (southEntity instanceof IInventory && !(southEntity instanceof TEWritingTable))
if (southEntity instanceof IInventory && !(southEntity instanceof TEChemistrySet))
{
inputInv2 = (IInventory) southEntity;
}
} else if (westEntity instanceof TEWritingTable)
} else if (westEntity instanceof TEChemistrySet)
{
alchemyEntity = (TEWritingTable) westEntity;
if (eastEntity instanceof IInventory && !(eastEntity instanceof TEWritingTable))
alchemyEntity = (TEChemistrySet) westEntity;
if (eastEntity instanceof IInventory && !(eastEntity instanceof TEChemistrySet))
{
outputInv = (IInventory) eastEntity;
}
if (northEntity instanceof IInventory && !(northEntity instanceof TEWritingTable))
if (northEntity instanceof IInventory && !(northEntity instanceof TEChemistrySet))
{
inputInv1 = (IInventory) northEntity;
}
if (southEntity instanceof IInventory && !(southEntity instanceof TEWritingTable))
if (southEntity instanceof IInventory && !(southEntity instanceof TEChemistrySet))
{
inputInv2 = (IInventory) southEntity;
}

4
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectDemonPortal.java
View file

@ -21,7 +21,7 @@ import WayofTime.alchemicalWizardry.api.rituals.RitualEffect;
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
import WayofTime.alchemicalWizardry.common.demonVillage.tileEntity.TEDemonPortal;
import WayofTime.alchemicalWizardry.api.tile.IBloodAltar;
import WayofTime.alchemicalWizardry.common.tileEntity.TEBellJar;
import WayofTime.alchemicalWizardry.common.tileEntity.TEBelljar;
public class RitualEffectDemonPortal extends RitualEffect
{
@ -137,7 +137,7 @@ public class RitualEffectDemonPortal extends RitualEffect
for(Int3 pos : jarLocations)
{
if(!(ritualStone.getWorld().getTileEntity(x + pos.xCoord, y + pos.yCoord, z + pos.zCoord) instanceof TEBellJar))
if(!(ritualStone.getWorld().getTileEntity(x + pos.xCoord, y + pos.yCoord, z + pos.zCoord) instanceof TEBelljar))
{
return false;
}