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

Merge pull request #404 from Arcaratus/bloodmagic1.8

Browse source 
Did ModBlocks
This commit is contained in:
WayofTime 2015-07-29 11:34:46 -04:00
commit 1fbebc56a2
24 changed files with 216 additions and 396 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/main/java/WayofTime/alchemicalWizardry/common/block/ArmourForge.java → src/main/java/WayofTime/alchemicalWizardry/common/block/BlockArmourForge.java
View file

@ -7,11 +7,8 @@ import WayofTime.alchemicalWizardry.common.ArmourComponent;
import WayofTime.alchemicalWizardry.common.items.armour.BoundArmour;
import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
import WayofTime.alchemicalWizardry.common.tileEntity.TESocket;
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.IIconRegister;
import net.minecraft.entity.effect.EntityLightningBolt;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
@ -20,31 +17,25 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import java.util.ArrayList;
import java.util.List;
public class ArmourForge extends Block
public class BlockArmourForge extends Block
{
public static List<ArmourComponent> helmetList = new ArrayList();
public static List<ArmourComponent> plateList = new ArrayList();
public static List<ArmourComponent> leggingsList = new ArrayList();
public static List<ArmourComponent> bootsList = new ArrayList();
public List<ArmourComponent> helmetList = new ArrayList();
public List<ArmourComponent> plateList = new ArrayList();
public List<ArmourComponent> leggingsList = new ArrayList();
public List<ArmourComponent> bootsList = new ArrayList();
public ArmourForge()
public BlockArmourForge()
{
super(Material.iron);
setHardness(2.0F);
setResistance(5.0F);
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
this.setBlockName("armourForge");
}
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister iconRegister)
{
this.blockIcon = iconRegister.registerIcon("AlchemicalWizardry:SoulForge");
}
@Override

4
src/main/java/WayofTime/alchemicalWizardry/common/block/BloodRune.java → src/main/java/WayofTime/alchemicalWizardry/common/block/BlockBloodRune.java
View file

@ -14,7 +14,7 @@ import net.minecraft.util.IIcon;
import java.util.List;
public class BloodRune extends Block
public class BlockBloodRune extends Block
{
//private Icon bloodRuneIcon;
@SideOnly(Side.CLIENT)
@ -28,7 +28,7 @@ public class BloodRune extends Block
@SideOnly(Side.CLIENT)
private IIcon accelerationRuneIcon;
public BloodRune()
public BlockBloodRune()
{
super(Material.iron);
this.setBlockName("bloodRune");

4
src/main/java/WayofTime/alchemicalWizardry/common/block/BloodStoneBrick.java → src/main/java/WayofTime/alchemicalWizardry/common/block/BlockBloodStoneBrick.java
View file

@ -7,9 +7,9 @@ import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
public class BloodStoneBrick extends Block
public class BlockBloodStoneBrick extends Block
{
public BloodStoneBrick()
public BlockBloodStoneBrick()
{
super(Material.iron);
setHardness(2.0F);

6
src/main/java/WayofTime/alchemicalWizardry/common/block/BlockWritingTable.java → src/main/java/WayofTime/alchemicalWizardry/common/block/BlockChemistrySet.java
View file

@ -22,7 +22,7 @@ import net.minecraft.world.World;
import java.util.List;
import java.util.Random;
public class BlockWritingTable extends BlockContainer
public class BlockChemistrySet extends BlockContainer
{
@SideOnly(Side.CLIENT)
private IIcon topIcon;
@ -31,13 +31,11 @@ public class BlockWritingTable extends BlockContainer
@SideOnly(Side.CLIENT)
private IIcon bottomIcon;
public BlockWritingTable()
public BlockChemistrySet()
{
super(Material.wood);
setHardness(2.0F);
setResistance(5.0F);
this.setBlockName("blockWritingTable");
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
}
@Override

4
src/main/java/WayofTime/alchemicalWizardry/common/block/EfficiencyRune.java → src/main/java/WayofTime/alchemicalWizardry/common/block/BlockEfficiencyRune.java
View file

@ -5,9 +5,9 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
public class EfficiencyRune extends BloodRune
public class BlockEfficiencyRune extends BlockBloodRune
{
public EfficiencyRune()
public BlockEfficiencyRune()
{
super();
this.setBlockName("efficiencyRune");

4
src/main/java/WayofTime/alchemicalWizardry/common/block/EmptySocket.java → src/main/java/WayofTime/alchemicalWizardry/common/block/BlockEmptySocket.java
View file

@ -7,9 +7,9 @@ import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
public class EmptySocket extends Block
public class BlockEmptySocket extends Block
{
public EmptySocket()
public BlockEmptySocket()
{
super(Material.iron);
setHardness(2.0F);

48
src/main/java/WayofTime/alchemicalWizardry/common/block/BlockSocket.java → src/main/java/WayofTime/alchemicalWizardry/common/block/BlockFilledSocket.java
View file

@ -8,6 +8,7 @@ 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.block.state.IBlockState;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
@ -15,58 +16,27 @@ import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import java.util.Random;
public class BlockSocket extends BlockContainer
public class BlockFilledSocket extends BlockContainer
{
@SideOnly(Side.CLIENT)
private IIcon topIcon;
@SideOnly(Side.CLIENT)
private IIcon sideIcon2;
@SideOnly(Side.CLIENT)
private IIcon bottomIcon;
public BlockSocket()
public BlockFilledSocket()
{
super(Material.rock);
setHardness(2.0F);
setResistance(5.0F);
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
this.setBlockName("bloodSocket");
//func_111022_d("AlchemicalWizardry:blocks");
}
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister iconRegister)
public boolean onBlockActivated(World world, BlockPos blockPos, IBlockState blockState, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ)
{
this.topIcon = iconRegister.registerIcon("AlchemicalWizardry:BloodSocket");
this.sideIcon2 = iconRegister.registerIcon("AlchemicalWizardry:BloodSocket");
this.bottomIcon = iconRegister.registerIcon("AlchemicalWizardry:BloodSocket");
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIcon(int side, int meta)
{
switch (side)
{
case 0:
return bottomIcon;
case 1:
return topIcon;
default:
return sideIcon2;
}
}
@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.getTileEntity(x, y, z);
TESocket tileEntity = (TESocket) world.getTileEntity(blockPos);
if (tileEntity == null || player.isSneaking())
{
@ -96,12 +66,12 @@ public class BlockSocket extends BlockContainer
tileEntity.setActive();
return true;
}
world.markBlockForUpdate(x, y, z);
world.markBlockForUpdate(blockPos);
return false;
}
@Override
public void breakBlock(World world, int x, int y, int z, Block par5, int par6)
public void breakBlock(World world, BlockPos blockPos, Block par5, int par6)
{
dropItems(world, x, y, z);
super.breakBlock(world, x, y, z, par5, par6);

4
src/main/java/WayofTime/alchemicalWizardry/common/block/ImperfectRitualStone.java → src/main/java/WayofTime/alchemicalWizardry/common/block/BlockImperfectRitualStone.java
View file

@ -16,9 +16,9 @@ import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.world.World;
public class ImperfectRitualStone extends Block
public class BlockImperfectRitualStone extends Block
{
public ImperfectRitualStone()
public BlockImperfectRitualStone()
{
super(Material.iron);
setHardness(2.0F);

4
src/main/java/WayofTime/alchemicalWizardry/common/block/BlockCrucible.java → src/main/java/WayofTime/alchemicalWizardry/common/block/BlockIncenseCrucible.java
View file

@ -21,7 +21,7 @@ import WayofTime.alchemicalWizardry.common.tileEntity.TECrucible;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class BlockCrucible extends BlockContainer
public class BlockIncenseCrucible extends BlockContainer
{
@SideOnly(Side.CLIENT)
private IIcon topIcon;
@ -30,7 +30,7 @@ public class BlockCrucible extends BlockContainer
@SideOnly(Side.CLIENT)
private IIcon bottomIcon;
public BlockCrucible()
public BlockIncenseCrucible()
{
super(Material.anvil);
this.setHardness(2.0f);

4
src/main/java/WayofTime/alchemicalWizardry/common/block/LargeBloodStoneBrick.java → src/main/java/WayofTime/alchemicalWizardry/common/block/BlockLargeBloodStoneBrick.java
View file

@ -7,9 +7,9 @@ import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
public class LargeBloodStoneBrick extends Block
public class BlockLargeBloodStoneBrick extends Block
{
public LargeBloodStoneBrick()
public BlockLargeBloodStoneBrick()
{
super(Material.iron);
setHardness(2.0F);

4
src/main/java/WayofTime/alchemicalWizardry/common/block/LifeEssenceBlock.java → src/main/java/WayofTime/alchemicalWizardry/common/block/BlockLifeEssence.java
View file

@ -10,9 +10,9 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.fluids.BlockFluidClassic;
public class LifeEssenceBlock extends BlockFluidClassic
public class BlockLifeEssence extends BlockFluidClassic
{
public LifeEssenceBlock()
public BlockLifeEssence()
{
super(AlchemicalWizardry.lifeEssenceFluid, Material.water);
AlchemicalWizardry.lifeEssenceFluid.setBlock(this);

6
src/main/java/WayofTime/alchemicalWizardry/common/block/MimicBlock.java → src/main/java/WayofTime/alchemicalWizardry/common/block/BlockMimic.java
View file

@ -21,9 +21,9 @@ import WayofTime.alchemicalWizardry.common.tileEntity.TEMimicBlock;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class MimicBlock extends BlockContainer
public class BlockMimic extends BlockContainer
{
public MimicBlock()
public BlockMimic()
{
super(Material.water);
setHardness(2.0F);
@ -151,7 +151,7 @@ public class MimicBlock extends BlockContainer
break;
}
MimicBlock.addHitEffect(TE, target, xOffset, yOffset, zOffset, null, effectRenderer);
BlockMimic.addHitEffect(TE, target, xOffset, yOffset, zOffset, null, effectRenderer);
return true;

4
src/main/java/WayofTime/alchemicalWizardry/common/block/RitualStone.java → src/main/java/WayofTime/alchemicalWizardry/common/block/BlockRitualStone.java
View file

@ -14,7 +14,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
public class RitualStone extends Block implements IRitualStone
public class BlockRitualStone extends Block implements IRitualStone
{
@SideOnly(Side.CLIENT)
private IIcon blankIcon;
@ -31,7 +31,7 @@ public class RitualStone extends Block implements IRitualStone
@SideOnly(Side.CLIENT)
private IIcon dawnStoneIcon;
public RitualStone()
public BlockRitualStone()
{
super(Material.iron);
setHardness(2.0F);

4
src/main/java/WayofTime/alchemicalWizardry/common/block/RuneOfSacrifice.java → src/main/java/WayofTime/alchemicalWizardry/common/block/BlockRuneOfSacrifice.java
View file

@ -5,9 +5,9 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
public class RuneOfSacrifice extends BloodRune
public class BlockRuneOfSacrifice extends BlockBloodRune
{
public RuneOfSacrifice()
public BlockRuneOfSacrifice()
{
super();
this.setBlockName("runeOfSacrifice");

4
src/main/java/WayofTime/alchemicalWizardry/common/block/RuneOfSelfSacrifice.java → src/main/java/WayofTime/alchemicalWizardry/common/block/BlockRuneOfSelfSacrifice.java
View file

@ -5,9 +5,9 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
public class RuneOfSelfSacrifice extends BloodRune
public class BlockRuneOfSelfSacrifice extends BlockBloodRune
{
public RuneOfSelfSacrifice()
public BlockRuneOfSelfSacrifice()
{
super();
this.setBlockName("runeOfSelfSacrifice");

4
src/main/java/WayofTime/alchemicalWizardry/common/block/SpectralBlock.java → src/main/java/WayofTime/alchemicalWizardry/common/block/BlockSpectral.java
View file

@ -17,9 +17,9 @@ import net.minecraft.world.World;
import java.util.Random;
public class SpectralBlock extends BlockContainer
public class BlockSpectral extends BlockContainer
{
public SpectralBlock()
public BlockSpectral()
{
super(Material.rock);
this.setBlockName("spectralBlock");

4
src/main/java/WayofTime/alchemicalWizardry/common/block/SpeedRune.java → src/main/java/WayofTime/alchemicalWizardry/common/block/BlockSpeedRune.java
View file

@ -5,9 +5,9 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
public class SpeedRune extends BloodRune
public class BlockSpeedRune extends BlockBloodRune
{
public SpeedRune()
public BlockSpeedRune()
{
super();
this.setBlockName("speedRune");

4
src/main/java/WayofTime/alchemicalWizardry/common/block/BlockHomHeart.java → src/main/java/WayofTime/alchemicalWizardry/common/block/BlockSpellTable.java
View file

@ -15,7 +15,7 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
public class BlockHomHeart extends BlockContainer
public class BlockSpellTable extends BlockContainer
{
@SideOnly(Side.CLIENT)
private IIcon bottomIcon;
@ -24,7 +24,7 @@ public class BlockHomHeart extends BlockContainer
@SideOnly(Side.CLIENT)
private IIcon sideIcon;
public BlockHomHeart()
public BlockSpellTable()
{
super(Material.rock);
setHardness(2.0F);

8
src/main/java/WayofTime/alchemicalWizardry/common/bloodAltarUpgrade/UpgradedAltars.java
View file

@ -10,7 +10,7 @@ import net.minecraft.util.BlockPos;
import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.ModBlocks;
import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.IFadedRune;
import WayofTime.alchemicalWizardry.common.block.BloodRune;
import WayofTime.alchemicalWizardry.common.block.BlockBloodRune;
public class UpgradedAltars
{
@ -46,7 +46,7 @@ public class UpgradedAltars
if (ac.isBloodRune())
{
if (!(block instanceof BloodRune))
if (!(block instanceof BlockBloodRune))
{
return false;
}
@ -85,14 +85,14 @@ public class UpgradedAltars
Block testBlock = state.getBlock();
int meta = testBlock.getMetaFromState(state);
if (testBlock instanceof BloodRune)
if (testBlock instanceof BlockBloodRune)
{
if (testBlock instanceof IFadedRune && altarTier > ((IFadedRune)testBlock).getAltarTierLimit(meta))
{
return UpgradedAltars.getUpgrades(world, pos, ((IFadedRune)testBlock).getAltarTierLimit(meta));
}
switch (((BloodRune) testBlock).getRuneEffect(meta))
switch (((BlockBloodRune) testBlock).getRuneEffect(meta))
{
case 1:
upgrades.addSpeedUpgrade();

4
src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDismantler.java
View file

@ -4,7 +4,7 @@ import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.ModBlocks;
import WayofTime.alchemicalWizardry.api.rituals.RitualComponent;
import WayofTime.alchemicalWizardry.api.rituals.Rituals;
import WayofTime.alchemicalWizardry.common.block.RitualStone;
import WayofTime.alchemicalWizardry.common.block.BlockRitualStone;
import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -75,7 +75,7 @@ public class ItemRitualDismantler extends EnergyItems
for (RitualComponent rc : ritualList)
{
if (!world.isAirBlock(x + rc.getX(direction), y + rc.getY(), z + rc.getZ(direction)) && world.getBlock(x + rc.getX(direction), y + rc.getY(), z + rc.getZ(direction)) instanceof RitualStone)
if (!world.isAirBlock(x + rc.getX(direction), y + rc.getY(), z + rc.getZ(direction)) && world.getBlock(x + rc.getX(direction), y + rc.getY(), z + rc.getZ(direction)) instanceof BlockRitualStone)
{
if (freeSpace >= 0)
{