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

Massive rework of configs, items and blocks.

Browse source 
I redone where the items/blocsks are stored and how the configs are
handled to clean up it and give space. You can change the config line to
AWWayofTime if you want to keep the compatibility with old configs. Now
you reference the blocks from the ModBlocks and Items from the ModItems.
This commit is contained in:
Fenn 2014-01-17 21:05:38 +00:00
parent 8601e9faff
commit e3644f2d2b
304 changed files with 3941 additions and 5108 deletions
Download patch file Download diff file Expand all files Collapse all files

34
BM_src/WayofTime/alchemicalWizardry/common/block/ArmourForge.java
View file

@ -1,14 +1,15 @@
package WayofTime.alchemicalWizardry.common.block;
import java.util.ArrayList;
import java.util.List;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.ArmourComponent;
import WayofTime.alchemicalWizardry.common.ArmourUpgrade;
import WayofTime.alchemicalWizardry.common.ModItems;
import WayofTime.alchemicalWizardry.common.items.BoundArmour;
import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
import WayofTime.alchemicalWizardry.common.tileEntity.TESocket;
import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
@ -20,12 +21,11 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class ArmourForge extends Block
{
import java.util.ArrayList;
import java.util.List;
public class ArmourForge extends Block {
public static List<ArmourComponent> helmetList = new ArrayList();
public static List<ArmourComponent> plateList = new ArrayList();
public static List<ArmourComponent> leggingsList = new ArrayList();
@ -77,22 +77,22 @@ public class ArmourForge extends Block
{
case 0:
list = plateList;
armourPiece = new ItemStack(AlchemicalWizardry.boundPlate.itemID, 1, 0);
armourPiece = new ItemStack(ModItems.boundPlate.itemID, 1, 0);
break;
case 1:
list = leggingsList;
armourPiece = new ItemStack(AlchemicalWizardry.boundLeggings.itemID, 1, 0);
armourPiece = new ItemStack(ModItems.boundLeggings.itemID, 1, 0);
break;
case 2:
list = helmetList;
armourPiece = new ItemStack(AlchemicalWizardry.boundHelmet.itemID, 1, 0);
armourPiece = new ItemStack(ModItems.boundHelmet.itemID, 1, 0);
break;
case 3:
list = bootsList;
armourPiece = new ItemStack(AlchemicalWizardry.boundBoots.itemID, 1, 0);
armourPiece = new ItemStack(ModItems.boundBoots.itemID, 1, 0);
break;
}
@ -149,16 +149,16 @@ public class ArmourForge extends Block
if (tileEntity instanceof TESocket)
{
ItemStack itemStack = ((TESocket)tileEntity).getStackInSlot(0);
ItemStack itemStack = ((TESocket) tileEntity).getStackInSlot(0);
int xCoord = tileEntity.xCoord;
int yCoord = tileEntity.yCoord;
int zCoord = tileEntity.zCoord;
((TESocket)tileEntity).setInventorySlotContents(0, null);
((TESocket) tileEntity).setInventorySlotContents(0, null);
world.setBlockToAir(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord);
for (int i = 0; i < 8; i++)
{
PacketDispatcher.sendPacketToAllAround(xCoord, yCoord, zCoord, 20, world.provider.dimensionId, TEAltar.getParticlePacket(xCoord, yCoord, zCoord, (short)1));
PacketDispatcher.sendPacketToAllAround(xCoord, yCoord, zCoord, 20, world.provider.dimensionId, TEAltar.getParticlePacket(xCoord, yCoord, zCoord, (short) 1));
}
if (itemStack != null)
@ -167,7 +167,7 @@ public class ArmourForge extends Block
if (item instanceof ArmourUpgrade)
{
((BoundArmour)armourPiece.getItem()).hasAddedToInventory(armourPiece, itemStack.copy());
((BoundArmour) armourPiece.getItem()).hasAddedToInventory(armourPiece, itemStack.copy());
((TESocket) tileEntity).setInventorySlotContents(0, null);
}
}
@ -177,7 +177,7 @@ public class ArmourForge extends Block
if (armourPiece != null)
{
int xOff = (world.rand.nextInt(11) - 5);
int zOff = (int)(Math.sqrt(25 - xOff * xOff) * (world.rand.nextInt(2) - 0.5) * 2);
int zOff = (int) (Math.sqrt(25 - xOff * xOff) * (world.rand.nextInt(2) - 0.5) * 2);
world.addWeatherEffect(new EntityLightningBolt(world, x + xOff, y + 5, z + zOff));
world.spawnEntityInWorld(new EntityItem(world, x, y + 1, z, armourPiece));
}

59
BM_src/WayofTime/alchemicalWizardry/common/block/BlockAltar.java
View file

@ -1,7 +1,14 @@
package WayofTime.alchemicalWizardry.common.block;
import java.util.Random;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.ModItems;
import WayofTime.alchemicalWizardry.common.PacketHandler;
import WayofTime.alchemicalWizardry.common.items.EnergyBattery;
import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfHolding;
import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
@ -14,17 +21,10 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Icon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.PacketHandler;
import WayofTime.alchemicalWizardry.common.items.EnergyBattery;
import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfHolding;
import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class BlockAltar extends BlockContainer
{
import java.util.Random;
public class BlockAltar extends BlockContainer {
@SideOnly(Side.CLIENT)
private static Icon topIcon;
@SideOnly(Side.CLIENT)
@ -33,6 +33,7 @@ public class BlockAltar extends BlockContainer
private static Icon sideIcon2;
@SideOnly(Side.CLIENT)
private static Icon bottomIcon;
public BlockAltar(int id)
{
super(id, Material.rock);
@ -65,10 +66,10 @@ public class BlockAltar extends BlockContainer
case 1:
return topIcon;
//case 2: return sideIcon1;
//case 3: return sideIcon1;
//case 4: return sideIcon2;
//case 5: return sideIcon2;
//case 2: return sideIcon1;
//case 3: return sideIcon1;
//case 4: return sideIcon2;
//case 5: return sideIcon2;
default:
return sideIcon2;
}
@ -77,7 +78,7 @@ public class BlockAltar extends BlockContainer
@Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int idk, float what, float these, float are)
{
TEAltar tileEntity = (TEAltar)world.getBlockTileEntity(x, y, z);
TEAltar tileEntity = (TEAltar) world.getBlockTileEntity(x, y, z);
// world.scheduleBlockUpdate(x, y, z, this.blockID, 0);
@ -90,7 +91,7 @@ public class BlockAltar extends BlockContainer
if (playerItem != null)
{
if (playerItem.getItem().itemID == AlchemicalWizardry.divinationSigil.itemID)
if (playerItem.getItem().itemID == ModItems.divinationSigil.itemID)
{
if (player.worldObj.isRemote)
{
@ -98,12 +99,11 @@ public class BlockAltar extends BlockContainer
}
return true;
}
else if (playerItem.getItem().itemID == AlchemicalWizardry.sigilOfHolding.itemID)
} else if (playerItem.getItem().itemID == ModItems.sigilOfHolding.itemID)
{
ItemStack item = ((SigilOfHolding)playerItem.getItem()).getCurrentItem(playerItem);
ItemStack item = ((SigilOfHolding) playerItem.getItem()).getCurrentItem(playerItem);
if (item != null && item.getItem().itemID == AlchemicalWizardry.divinationSigil.itemID)
if (item != null && item.getItem().itemID == ModItems.divinationSigil.itemID)
{
if (player.worldObj.isRemote)
{
@ -126,8 +126,7 @@ public class BlockAltar extends BlockContainer
--playerItem.stackSize;
tileEntity.setInventorySlotContents(0, newItem);
tileEntity.startCycle();
}
else if (tileEntity.getStackInSlot(0) != null && playerItem == null)
} else if (tileEntity.getStackInSlot(0) != null && playerItem == null)
{
/**stub method
* Add the item that is in the slot to the player's inventory, and
@ -173,8 +172,8 @@ public class BlockAltar extends BlockContainer
float ry = rand.nextFloat() * 0.8F + 0.1F;
float rz = rand.nextFloat() * 0.8F + 0.1F;
EntityItem entityItem = new EntityItem(world,
x + rx, y + ry, z + rz,
new ItemStack(item.itemID, item.stackSize, item.getItemDamage()));
x + rx, y + ry, z + rz,
new ItemStack(item.itemID, item.stackSize, item.getItemDamage()));
if (item.hasTagCompound())
{
@ -224,7 +223,7 @@ public class BlockAltar extends BlockContainer
@Override
public void randomDisplayTick(World world, int x, int y, int z, Random rand)
{
TEAltar tileEntity = (TEAltar)world.getBlockTileEntity(x, y, z);
TEAltar tileEntity = (TEAltar) world.getBlockTileEntity(x, y, z);
if (!tileEntity.isActive())
{
@ -260,15 +259,15 @@ public class BlockAltar extends BlockContainer
// {
// return 0;
// }
ItemStack stack = ((TEAltar)tile).getStackInSlot(0);
ItemStack stack = ((TEAltar) tile).getStackInSlot(0);
if (stack != null && stack.getItem() instanceof EnergyBattery)
{
EnergyBattery bloodOrb = (EnergyBattery)stack.getItem();
EnergyBattery bloodOrb = (EnergyBattery) stack.getItem();
int maxEssence = bloodOrb.getMaxEssence();
int currentEssence = bloodOrb.getCurrentEssence(stack);
int level = currentEssence * 15 / maxEssence;
return((int)(Math.min(15, level))) % 16;
return ((int) (Math.min(15, level))) % 16;
}
}

11
BM_src/WayofTime/alchemicalWizardry/common/block/BlockBloodLightSource.java
View file

@ -1,8 +1,5 @@
package WayofTime.alchemicalWizardry.common.block;
import java.util.List;
import java.util.Random;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
@ -13,8 +10,10 @@ import net.minecraft.util.AxisAlignedBB;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
public class BlockBloodLightSource extends Block
{
import java.util.List;
import java.util.Random;
public class BlockBloodLightSource extends Block {
public BlockBloodLightSource(int par1)
{
super(par1, Material.cloth);
@ -52,7 +51,7 @@ public class BlockBloodLightSource extends Block
{
if (rand.nextInt(3) != 0)
{
float f = (float)1.0F;
float f = (float) 1.0F;
float f1 = f * 0.6F + 0.4F;
float f2 = f * f * 0.7F - 0.5F;
float f3 = f * f * 0.6F - 0.7F;

39
BM_src/WayofTime/alchemicalWizardry/common/block/BlockConduit.java
View file

@ -2,6 +2,8 @@ package WayofTime.alchemicalWizardry.common.block;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.tileEntity.TEConduit;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
@ -10,11 +12,8 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Icon;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class BlockConduit extends BlockContainer
{
public class BlockConduit extends BlockContainer {
@SideOnly(Side.CLIENT)
private static Icon topIcon;
@SideOnly(Side.CLIENT)
@ -23,6 +22,7 @@ public class BlockConduit extends BlockContainer
private static Icon sideIcon2;
@SideOnly(Side.CLIENT)
private static Icon bottomIcon;
public BlockConduit(int id)
{
super(id, Material.rock);
@ -55,10 +55,10 @@ public class BlockConduit extends BlockContainer
case 1:
return topIcon;
//case 2: return sideIcon1;
//case 3: return sideIcon1;
//case 4: return sideIcon2;
//case 5: return sideIcon2;
//case 2: return sideIcon1;
//case 3: return sideIcon1;
//case 4: return sideIcon2;
//case 5: return sideIcon2;
default:
return sideIcon2;
}
@ -78,25 +78,22 @@ public class BlockConduit extends BlockContainer
if (tile instanceof TEConduit)
{
//TODO NEEDS WORK
if (((TEConduit)tile).getInputDirection().equals(sideClicked))
if (((TEConduit) tile).getInputDirection().equals(sideClicked))
{
((TEConduit)tile).setInputDirection(((TEConduit)tile).getOutputDirection());
((TEConduit)tile).setOutputDirection(sideClicked);
}
else if (((TEConduit)tile).getOutputDirection().equals(sideClicked))
((TEConduit) tile).setInputDirection(((TEConduit) tile).getOutputDirection());
((TEConduit) tile).setOutputDirection(sideClicked);
} else if (((TEConduit) tile).getOutputDirection().equals(sideClicked))
{
((TEConduit)tile).setOutputDirection(((TEConduit)tile).getInputDirection());
((TEConduit)tile).setInputDirection(sideClicked);
}
else
((TEConduit) tile).setOutputDirection(((TEConduit) tile).getInputDirection());
((TEConduit) tile).setInputDirection(sideClicked);
} else
{
if (!player.isSneaking())
{
((TEConduit)tile).setOutputDirection(sideClicked);
}
else
((TEConduit) tile).setOutputDirection(sideClicked);
} else
{
((TEConduit)tile).setOutputDirection(sideClicked.getOpposite());
((TEConduit) tile).setOutputDirection(sideClicked.getOpposite());
}
}
}

23
BM_src/WayofTime/alchemicalWizardry/common/block/BlockHomHeart.java
View file

@ -1,5 +1,10 @@
package WayofTime.alchemicalWizardry.common.block;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.items.BlankSpell;
import WayofTime.alchemicalWizardry.common.tileEntity.TEHomHeart;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.BlockGrass;
import net.minecraft.block.material.Material;
@ -10,14 +15,8 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Icon;
import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.items.BlankSpell;
import WayofTime.alchemicalWizardry.common.tileEntity.TEHomHeart;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class BlockHomHeart extends BlockContainer
{
public class BlockHomHeart extends BlockContainer {
public Icon bottomIcon;
public Icon topIcon;
public Icon sideIcon;
@ -52,10 +51,10 @@ public class BlockHomHeart extends BlockContainer
case 1:
return topIcon;
//case 2: return sideIcon1;
//case 3: return sideIcon1;
//case 4: return sideIcon2;
//case 5: return sideIcon2;
//case 2: return sideIcon1;
//case 3: return sideIcon1;
//case 4: return sideIcon2;
//case 5: return sideIcon2;
default:
return sideIcon;
}
@ -64,7 +63,7 @@ public class BlockHomHeart extends BlockContainer
@Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int idk, float what, float these, float are)
{
TEHomHeart tileEntity = (TEHomHeart)world.getBlockTileEntity(x, y, z);
TEHomHeart tileEntity = (TEHomHeart) world.getBlockTileEntity(x, y, z);
if (tileEntity == null || player.isSneaking())
{

17
BM_src/WayofTime/alchemicalWizardry/common/block/BlockMasterStone.java
View file

@ -1,5 +1,10 @@
package WayofTime.alchemicalWizardry.common.block;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.items.ActivationCrystal;
import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
@ -8,14 +13,8 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.items.ActivationCrystal;
import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class BlockMasterStone extends BlockContainer
{
public class BlockMasterStone extends BlockContainer {
public BlockMasterStone(int id)
{
super(id, Material.iron);
@ -36,7 +35,7 @@ public class BlockMasterStone extends BlockContainer
@Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int idk, float what, float these, float are)
{
TEMasterStone tileEntity = (TEMasterStone)world.getBlockTileEntity(x, y, z);
TEMasterStone tileEntity = (TEMasterStone) world.getBlockTileEntity(x, y, z);
if (tileEntity == null || player.isSneaking())
{
@ -57,7 +56,7 @@ public class BlockMasterStone extends BlockContainer
return false;
}
ActivationCrystal acItem = (ActivationCrystal)item;
ActivationCrystal acItem = (ActivationCrystal) item;
tileEntity.setOwner(acItem.getOwnerName(playerItem));
tileEntity.activateRitual(world, acItem.getCrystalLevel(playerItem));
world.markBlockForUpdate(x, y, z);

26
BM_src/WayofTime/alchemicalWizardry/common/block/BlockPedestal.java
View file

@ -1,13 +1,12 @@
package WayofTime.alchemicalWizardry.common.block;
import java.util.Random;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.tileEntity.TEPedestal;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
@ -18,11 +17,10 @@ import net.minecraft.util.Icon;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.Vec3;
import net.minecraft.world.World;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class BlockPedestal extends BlockContainer
{
import java.util.Random;
public class BlockPedestal extends BlockContainer {
@SideOnly(Side.CLIENT)
private static Icon topIcon;
@SideOnly(Side.CLIENT)
@ -31,6 +29,7 @@ public class BlockPedestal extends BlockContainer
private static Icon sideIcon2;
@SideOnly(Side.CLIENT)
private static Icon bottomIcon;
public BlockPedestal(int id)
{
super(id, Material.rock);
@ -63,10 +62,10 @@ public class BlockPedestal extends BlockContainer
case 1:
return topIcon;
//case 2: return sideIcon1;
//case 3: return sideIcon1;
//case 4: return sideIcon2;
//case 5: return sideIcon2;
//case 2: return sideIcon1;
//case 3: return sideIcon1;
//case 4: return sideIcon2;
//case 5: return sideIcon2;
default:
return sideIcon2;
}
@ -75,7 +74,7 @@ public class BlockPedestal extends BlockContainer
@Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int idk, float what, float these, float are)
{
TEPedestal tileEntity = (TEPedestal)world.getBlockTileEntity(x, y, z);
TEPedestal tileEntity = (TEPedestal) world.getBlockTileEntity(x, y, z);
if (tileEntity == null || player.isSneaking())
{
@ -90,8 +89,7 @@ public class BlockPedestal extends BlockContainer
newItem.stackSize = 1;
--playerItem.stackSize;
tileEntity.setInventorySlotContents(0, newItem);
}
else if (tileEntity.getStackInSlot(0) != null && playerItem == null)
} else if (tileEntity.getStackInSlot(0) != null && playerItem == null)
{
/**stub method
* Add the item that is in the slot to the player's inventory, and

26
BM_src/WayofTime/alchemicalWizardry/common/block/BlockPlinth.java
View file

@ -1,13 +1,12 @@
package WayofTime.alchemicalWizardry.common.block;
import java.util.Random;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.tileEntity.TEPlinth;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
@ -18,11 +17,10 @@ import net.minecraft.util.Icon;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.Vec3;
import net.minecraft.world.World;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class BlockPlinth extends BlockContainer
{
import java.util.Random;
public class BlockPlinth extends BlockContainer {
@SideOnly(Side.CLIENT)
private static Icon topIcon;
@SideOnly(Side.CLIENT)
@ -31,6 +29,7 @@ public class BlockPlinth extends BlockContainer
private static Icon sideIcon2;
@SideOnly(Side.CLIENT)
private static Icon bottomIcon;
public BlockPlinth(int id)
{
super(id, Material.rock);
@ -63,10 +62,10 @@ public class BlockPlinth extends BlockContainer
case 1:
return topIcon;
//case 2: return sideIcon1;
//case 3: return sideIcon1;
//case 4: return sideIcon2;
//case 5: return sideIcon2;
//case 2: return sideIcon1;
//case 3: return sideIcon1;
//case 4: return sideIcon2;
//case 5: return sideIcon2;
default:
return sideIcon2;
}
@ -75,7 +74,7 @@ public class BlockPlinth extends BlockContainer
@Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int idk, float what, float these, float are)
{
TEPlinth tileEntity = (TEPlinth)world.getBlockTileEntity(x, y, z);
TEPlinth tileEntity = (TEPlinth) world.getBlockTileEntity(x, y, z);
if (tileEntity == null || player.isSneaking())
{
@ -90,8 +89,7 @@ public class BlockPlinth extends BlockContainer
newItem.stackSize = 1;
--playerItem.stackSize;
tileEntity.setInventorySlotContents(0, newItem);
}
else if (tileEntity.getStackInSlot(0) != null && playerItem == null)
} else if (tileEntity.getStackInSlot(0) != null && playerItem == null)
{
/**stub method
* Add the item that is in the slot to the player's inventory, and

25
BM_src/WayofTime/alchemicalWizardry/common/block/BlockSocket.java
View file

@ -1,10 +1,10 @@
package WayofTime.alchemicalWizardry.common.block;
import java.util.Random;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.ArmourUpgrade;
import WayofTime.alchemicalWizardry.common.tileEntity.TESocket;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
@ -16,11 +16,10 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Icon;
import net.minecraft.world.World;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class BlockSocket extends BlockContainer
{
import java.util.Random;
public class BlockSocket extends BlockContainer {
@SideOnly(Side.CLIENT)
private static Icon topIcon;
@SideOnly(Side.CLIENT)
@ -29,6 +28,7 @@ public class BlockSocket extends BlockContainer
private static Icon sideIcon2;
@SideOnly(Side.CLIENT)
private static Icon bottomIcon;
public BlockSocket(int id)
{
super(id, Material.rock);
@ -61,10 +61,10 @@ public class BlockSocket extends BlockContainer
case 1:
return topIcon;
//case 2: return sideIcon1;
//case 3: return sideIcon1;
//case 4: return sideIcon2;
//case 5: return sideIcon2;
//case 2: return sideIcon1;
//case 3: return sideIcon1;
//case 4: return sideIcon2;
//case 5: return sideIcon2;
default:
return sideIcon2;
}
@ -73,7 +73,7 @@ public class BlockSocket extends BlockContainer
@Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int idk, float what, float these, float are)
{
TESocket tileEntity = (TESocket)world.getBlockTileEntity(x, y, z);
TESocket tileEntity = (TESocket) world.getBlockTileEntity(x, y, z);
if (tileEntity == null || player.isSneaking())
{
@ -91,8 +91,7 @@ public class BlockSocket extends BlockContainer
--playerItem.stackSize;
tileEntity.setInventorySlotContents(0, newItem);
}
}
else if (tileEntity.getStackInSlot(0) != null && playerItem == null)
} else if (tileEntity.getStackInSlot(0) != null && playerItem == null)
{
/**stub method
* Add the item that is in the slot to the player's inventory, and

22
BM_src/WayofTime/alchemicalWizardry/common/block/BlockTeleposer.java
View file

@ -1,10 +1,10 @@
package WayofTime.alchemicalWizardry.common.block;
import java.util.Random;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.items.TelepositionFocus;
import WayofTime.alchemicalWizardry.common.tileEntity.TETeleposer;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.BlockMobSpawner;
@ -18,11 +18,10 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Icon;
import net.minecraft.world.World;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class BlockTeleposer extends BlockContainer
{
import java.util.Random;
public class BlockTeleposer extends BlockContainer {
@SideOnly(Side.CLIENT)
private static Icon topIcon;
@SideOnly(Side.CLIENT)
@ -31,6 +30,7 @@ public class BlockTeleposer extends BlockContainer
private static Icon sideIcon2;
@SideOnly(Side.CLIENT)
private static Icon bottomIcon;
public BlockTeleposer(int id)
{
super(id, Material.rock);
@ -63,10 +63,10 @@ public class BlockTeleposer extends BlockContainer
case 1:
return topIcon;
//case 2: return sideIcon1;
//case 3: return sideIcon1;
//case 4: return sideIcon2;
//case 5: return sideIcon2;
//case 2: return sideIcon1;
//case 3: return sideIcon1;
//case 4: return sideIcon2;
//case 5: return sideIcon2;
default:
return sideIcon2;
}
@ -75,7 +75,7 @@ public class BlockTeleposer extends BlockContainer
@Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int idk, float what, float these, float are)
{
TETeleposer tileEntity = (TETeleposer)world.getBlockTileEntity(x, y, z);
TETeleposer tileEntity = (TETeleposer) world.getBlockTileEntity(x, y, z);
ItemStack playerItem = player.getCurrentEquippedItem();
if (playerItem != null)

24
BM_src/WayofTime/alchemicalWizardry/common/block/BlockWritingTable.java
View file

@ -1,8 +1,5 @@
package WayofTime.alchemicalWizardry.common.block;
import java.util.List;
import java.util.Random;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.tileEntity.TEWritingTable;
import cpw.mods.fml.relauncher.Side;
@ -10,7 +7,6 @@ import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
@ -20,12 +16,12 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.Icon;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.Vec3;
import net.minecraft.world.World;
public class BlockWritingTable extends BlockContainer
{
import java.util.List;
import java.util.Random;
public class BlockWritingTable extends BlockContainer {
@SideOnly(Side.CLIENT)
private static Icon topIcon;
@SideOnly(Side.CLIENT)
@ -66,10 +62,10 @@ public class BlockWritingTable extends BlockContainer
case 1:
return topIcon;
//case 2: return sideIcon1;
//case 3: return sideIcon1;
//case 4: return sideIcon2;
//case 5: return sideIcon2;
//case 2: return sideIcon1;
//case 3: return sideIcon1;
//case 4: return sideIcon2;
//case 5: return sideIcon2;
default:
return sideIcon2;
}
@ -119,8 +115,8 @@ public class BlockWritingTable extends BlockContainer
float ry = rand.nextFloat() * 0.8F + 0.1F;
float rz = rand.nextFloat() * 0.8F + 0.1F;
EntityItem entityItem = new EntityItem(world,
x + rx, y + ry, z + rz,
new ItemStack(item.itemID, item.stackSize, item.getItemDamage()));
x + rx, y + ry, z + rz,
new ItemStack(item.itemID, item.stackSize, item.getItemDamage()));
if (item.hasTagCompound())
{

17
BM_src/WayofTime/alchemicalWizardry/common/block/BloodRune.java
View file

@ -1,19 +1,19 @@
package WayofTime.alchemicalWizardry.common.block;
import java.util.List;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.ModBlocks;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Icon;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class BloodRune extends Block
{
import java.util.List;
public class BloodRune extends Block {
//private Icon bloodRuneIcon;
private Icon altarCapacityRuneIcon;
private Icon dislocationRuneIcon;
@ -65,14 +65,13 @@ public class BloodRune extends Block
*/
public void getSubBlocks(int par1, CreativeTabs par2CreativeTabs, List par3List)
{
if (this.blockID == AlchemicalWizardry.bloodRune.blockID)
if (this.blockID == ModBlocks.bloodRune.blockID)
{
par3List.add(new ItemStack(par1, 1, 0));
par3List.add(new ItemStack(par1, 1, 1));
par3List.add(new ItemStack(par1, 1, 2));
par3List.add(new ItemStack(par1, 1, 3));
}
else
} else
{
super.getSubBlocks(par1, par2CreativeTabs, par3List);
}

4
BM_src/WayofTime/alchemicalWizardry/common/block/BloodStoneBrick.java
View file

@ -6,10 +6,8 @@ import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
public class BloodStoneBrick extends Block
{
public class BloodStoneBrick extends Block {
public BloodStoneBrick(int par1)
{
super(par1, Material.iron);

4
BM_src/WayofTime/alchemicalWizardry/common/block/EfficiencyRune.java
View file

@ -4,10 +4,8 @@ import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
public class EfficiencyRune extends BloodRune
{
public class EfficiencyRune extends BloodRune {
public EfficiencyRune(int id)
{
super(id);

4
BM_src/WayofTime/alchemicalWizardry/common/block/EmptySocket.java
View file

@ -6,10 +6,8 @@ import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
public class EmptySocket extends Block
{
public class EmptySocket extends Block {
public EmptySocket(int par1)
{
super(par1, Material.iron);

5
BM_src/WayofTime/alchemicalWizardry/common/block/IOrientable.java
View file

@ -2,11 +2,12 @@ package WayofTime.alchemicalWizardry.common.block;
import net.minecraftforge.common.ForgeDirection;
public interface IOrientable
{
public interface IOrientable {
public ForgeDirection getInputDirection();
public ForgeDirection getOutputDirection();
public void setInputDirection(ForgeDirection direction);
public void setOutputDirection(ForgeDirection direction);
}

19
BM_src/WayofTime/alchemicalWizardry/common/block/ImperfectRitualStone.java
View file

@ -6,24 +6,16 @@ import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.effect.EntityLightningBolt;
import net.minecraft.entity.monster.EntityZombie;
import net.minecraft.entity.passive.EntityWolf;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemArmor;
import net.minecraft.item.ItemStack;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
public class ImperfectRitualStone extends Block
{
public class ImperfectRitualStone extends Block {
public ImperfectRitualStone(int id)
{
super(id, Material.iron);
@ -76,8 +68,7 @@ public class ImperfectRitualStone extends Block
world.getWorldInfo().setThunderTime(0);
world.getWorldInfo().setThundering(true);
return true;
}
else if (blockID == Block.coalBlock.blockID)
} else if (blockID == Block.coalBlock.blockID)
{
if (!player.capabilities.isCreativeMode && world.isRemote)
{
@ -107,8 +98,7 @@ public class ImperfectRitualStone extends Block
}
return true;
}
else if (blockID == Block.blockLapis.blockID)
} else if (blockID == Block.blockLapis.blockID)
{
if (!player.capabilities.isCreativeMode && world.isRemote)
{
@ -124,8 +114,7 @@ public class ImperfectRitualStone extends Block
// PacketDispatcher.sendPacketToServer(PacketHandler.getPacket(player.getEntityName(), -5000, 0));
// }
}
}
else if (blockID == Block.bedrock.blockID)
} else if (blockID == Block.bedrock.blockID)
{
if (!player.capabilities.isCreativeMode && world.isRemote)
{

4
BM_src/WayofTime/alchemicalWizardry/common/block/LargeBloodStoneBrick.java
View file

@ -6,10 +6,8 @@ import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
public class LargeBloodStoneBrick extends Block
{
public class LargeBloodStoneBrick extends Block {
public LargeBloodStoneBrick(int par1)
{
super(par1, Material.iron);

11
BM_src/WayofTime/alchemicalWizardry/common/block/LifeEssenceBlock.java
View file

@ -1,17 +1,16 @@
package WayofTime.alchemicalWizardry.common.block;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.util.Icon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.fluids.BlockFluidClassic;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class LifeEssenceBlock extends BlockFluidClassic
{
public class LifeEssenceBlock extends BlockFluidClassic {
public LifeEssenceBlock(int id)
{
super(id, AlchemicalWizardry.lifeEssenceFluid, Material.water);
@ -37,7 +36,7 @@ public class LifeEssenceBlock extends BlockFluidClassic
@Override
public boolean canDisplace(IBlockAccess world, int x, int y, int z)
{
if (world.getBlockMaterial(x, y, z).isLiquid())
if (world.getBlockMaterial(x, y, z).isLiquid())
{
return false;
}
@ -48,7 +47,7 @@ public class LifeEssenceBlock extends BlockFluidClassic
@Override
public boolean displaceIfPossible(World world, int x, int y, int z)
{
if (world.getBlockMaterial(x, y, z).isLiquid())
if (world.getBlockMaterial(x, y, z).isLiquid())
{
return false;
}

15
BM_src/WayofTime/alchemicalWizardry/common/block/LifeEssenceFlowing.java
View file

@ -1,15 +1,14 @@
package WayofTime.alchemicalWizardry.common.block;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.BlockFlowing;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.util.Icon;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class LifeEssenceFlowing extends BlockFlowing
{
public class LifeEssenceFlowing extends BlockFlowing {
protected LifeEssenceFlowing(int par1)
{
super(par1, Material.water);
@ -24,9 +23,9 @@ public class LifeEssenceFlowing extends BlockFlowing
public void registerIcons(IconRegister iconRegister)
{
this.theIcon = new Icon[]
{
iconRegister.registerIcon("AlchemicalWizardry:lifeEssenceStill"),
iconRegister.registerIcon("AlchemicalWizardry:lifeEssenceFlowing")
};
{
iconRegister.registerIcon("AlchemicalWizardry:lifeEssenceStill"),
iconRegister.registerIcon("AlchemicalWizardry:lifeEssenceFlowing")
};
}
}

12
BM_src/WayofTime/alchemicalWizardry/common/block/LifeEssenceStill.java
View file

@ -5,11 +5,9 @@ import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.BlockStationary;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.util.Icon;
public class LifeEssenceStill extends BlockStationary
{
public class LifeEssenceStill extends BlockStationary {
protected LifeEssenceStill(int par1)
{
super(par1, Material.water);
@ -25,9 +23,9 @@ public class LifeEssenceStill extends BlockStationary
public void registerIcons(IconRegister iconRegister)
{
this.theIcon = new Icon[]
{
iconRegister.registerIcon("AlchemicalWizardry:lifeEssenceStill"),
iconRegister.registerIcon("AlchemicalWizardry:lifeEssenceFlowing")
};
{
iconRegister.registerIcon("AlchemicalWizardry:lifeEssenceStill"),
iconRegister.registerIcon("AlchemicalWizardry:lifeEssenceFlowing")
};
}
}

13
BM_src/WayofTime/alchemicalWizardry/common/block/RitualStone.java
View file

@ -1,5 +1,9 @@
package WayofTime.alchemicalWizardry.common.block;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.items.ScribeTool;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
@ -8,13 +12,8 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Icon;
import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.items.ScribeTool;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class RitualStone extends Block
{
public class RitualStone extends Block {
@SideOnly(Side.CLIENT)
private static Icon blankIcon;
@SideOnly(Side.CLIENT)
@ -77,7 +76,7 @@ public class RitualStone extends Block
return false;
}
ScribeTool scribeTool = (ScribeTool)item;
ScribeTool scribeTool = (ScribeTool) item;
if (!player.capabilities.isCreativeMode)
{

4
BM_src/WayofTime/alchemicalWizardry/common/block/RuneOfSacrifice.java
View file

@ -4,10 +4,8 @@ import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
public class RuneOfSacrifice extends BloodRune
{
public class RuneOfSacrifice extends BloodRune {
public RuneOfSacrifice(int id)
{
super(id);

4
BM_src/WayofTime/alchemicalWizardry/common/block/RuneOfSelfSacrifice.java
View file

@ -4,10 +4,8 @@ import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
public class RuneOfSelfSacrifice extends BloodRune
{
public class RuneOfSelfSacrifice extends BloodRune {
public RuneOfSelfSacrifice(int id)
{
super(id);

16
BM_src/WayofTime/alchemicalWizardry/common/block/SpectralBlock.java
View file

@ -1,21 +1,18 @@
package WayofTime.alchemicalWizardry.common.block;
import java.util.Random;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.block.BlockLeaves;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class SpectralBlock extends Block
{
import java.util.Random;
public class SpectralBlock extends Block {
public SpectralBlock(int par1)
{
super(par1, Material.rock);
@ -89,8 +86,7 @@ public class SpectralBlock extends Block
}
return true;
}
else
} else
{
return false;
}

4
BM_src/WayofTime/alchemicalWizardry/common/block/SpeedRune.java
View file

@ -4,10 +4,8 @@ import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
public class SpeedRune extends BloodRune
{
public class SpeedRune extends BloodRune {
public SpeedRune(int id)
{
super(id);