From 256653501365eb4f95d3dddbcdfdc23a2a9594d5 Mon Sep 17 00:00:00 2001 From: OnyxDarkKnight Date: Tue, 15 Apr 2014 23:05:32 +0300 Subject: Moved source files --- .../jewelrycraft/block/BlockDisplayer.java | 185 ----------------- .../darkknight/jewelrycraft/block/BlockGlow.java | 39 ---- .../darkknight/jewelrycraft/block/BlockJCOre.java | 15 -- .../jewelrycraft/block/BlockJewelAltar.java | 119 ----------- .../block/BlockJewelrsCraftingTable.java | 222 --------------------- .../darkknight/jewelrycraft/block/BlockList.java | 68 ------- .../darkknight/jewelrycraft/block/BlockMolder.java | 151 -------------- .../jewelrycraft/block/BlockMoltenMetal.java | 117 ----------- .../darkknight/jewelrycraft/block/BlockShadow.java | 117 ----------- .../jewelrycraft/block/BlockSmelter.java | 197 ------------------ 10 files changed, 1230 deletions(-) delete mode 100644 eclipse/Jewelrycraft/common/darkknight/jewelrycraft/block/BlockDisplayer.java delete mode 100644 eclipse/Jewelrycraft/common/darkknight/jewelrycraft/block/BlockGlow.java delete mode 100644 eclipse/Jewelrycraft/common/darkknight/jewelrycraft/block/BlockJCOre.java delete mode 100644 eclipse/Jewelrycraft/common/darkknight/jewelrycraft/block/BlockJewelAltar.java delete mode 100644 eclipse/Jewelrycraft/common/darkknight/jewelrycraft/block/BlockJewelrsCraftingTable.java delete mode 100644 eclipse/Jewelrycraft/common/darkknight/jewelrycraft/block/BlockList.java delete mode 100644 eclipse/Jewelrycraft/common/darkknight/jewelrycraft/block/BlockMolder.java delete mode 100644 eclipse/Jewelrycraft/common/darkknight/jewelrycraft/block/BlockMoltenMetal.java delete mode 100644 eclipse/Jewelrycraft/common/darkknight/jewelrycraft/block/BlockShadow.java delete mode 100644 eclipse/Jewelrycraft/common/darkknight/jewelrycraft/block/BlockSmelter.java (limited to 'eclipse/Jewelrycraft/common/darkknight/jewelrycraft/block') diff --git a/eclipse/Jewelrycraft/common/darkknight/jewelrycraft/block/BlockDisplayer.java b/eclipse/Jewelrycraft/common/darkknight/jewelrycraft/block/BlockDisplayer.java deleted file mode 100644 index efdddff..0000000 --- a/eclipse/Jewelrycraft/common/darkknight/jewelrycraft/block/BlockDisplayer.java +++ /dev/null @@ -1,185 +0,0 @@ -package darkknight.jewelrycraft.block; - -import java.util.Random; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockContainer; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.MathHelper; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import darkknight.jewelrycraft.tileentity.TileEntityDisplayer; - -public class BlockDisplayer extends BlockContainer -{ - Random rand = new Random(); - - protected BlockDisplayer(Material par2Material) - { - super(par2Material); - } - - @Override - public TileEntity createNewTileEntity(World world, int var2) - { - return new TileEntityDisplayer(); - } - - @Override - public boolean renderAsNormalBlock() - { - return false; - } - - @Override - public boolean shouldSideBeRendered(IBlockAccess iblockaccess, int i, int j, int k, int l) - { - return false; - } - - @Override - public boolean isOpaqueCube() - { - return false; - } - - @Override - public int getRenderType() - { - return -1; - } - - @Override - public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer entityPlayer, int par6, float par7, float par8, float par9) - { - TileEntityDisplayer te = (TileEntityDisplayer) world.getTileEntity(i, j, k); - ItemStack item = entityPlayer.inventory.getCurrentItem(); - if (te != null && item != null && item != new ItemStack(Item.getItemById(0), 0, 0) && !world.isRemote) - { - if(!te.hasObject) - { - te.object = item.copy(); - te.object.stackSize = 1; - te.quantity += item.stackSize; - te.hasObject = true; - if (!entityPlayer.capabilities.isCreativeMode) item.stackSize = 0; - te.isDirty = true; - te.markDirty(); - } - else if(te.object.getItem() == item.getItem() && te.object != null && te.object != new ItemStack(Item.getItemById(0), 0, 0) && te.object.getItemDamage() == item.getItemDamage()) - { - if(te.object.hasTagCompound() && item.hasTagCompound() && te.object.getTagCompound().equals(item.getTagCompound())) - { - te.quantity += item.stackSize; - te.object.stackSize = 1; - if (!entityPlayer.capabilities.isCreativeMode) item.stackSize = 0; - te.isDirty = true; - te.markDirty(); - } - else if(!te.object.hasTagCompound() && !item.hasTagCompound()) - { - te.quantity += item.stackSize; - te.object.stackSize = 1; - if (!entityPlayer.capabilities.isCreativeMode) item.stackSize = 0; - te.isDirty = true; - te.markDirty(); - } - } - } - return true; - } - - @Override - public void onBlockClicked(World world, int i, int j, int k, EntityPlayer player) - { - TileEntityDisplayer te = (TileEntityDisplayer) world.getTileEntity(i, j, k); - if (te != null && !world.isRemote) - { - if (te.hasObject && te.object != null && te.object != new ItemStack(Item.getItemById(0), 0, 0) && player.inventory.addItemStackToInventory(te.object)) - { - if(player.isSneaking()) - { - if(te.quantity > te.object.getMaxStackSize()) - { - te.object.stackSize = te.object.getMaxStackSize() - 1; - player.inventory.addItemStackToInventory(te.object); - te.object.stackSize = 1; - te.quantity -= te.object.getMaxStackSize(); - } - else - { - te.object.stackSize = te.quantity - 1; - player.inventory.addItemStackToInventory(te.object); - te.hasObject = false; - te.object = new ItemStack(Item.getItemById(0), 0, 0); - te.quantity = 0; - } - te.isDirty = true; - te.markDirty(); - } - else - { - if(te.quantity >= 2) - { - player.inventory.addItemStackToInventory(te.object); - te.object.stackSize = 1; - --te.quantity; - } - else - { - player.inventory.addItemStackToInventory(te.object); - te.object.stackSize = 1; - te.hasObject = false; - te.object = new ItemStack(Item.getItemById(0), 0, 0); - te.quantity = 0; - } - te.isDirty = true; - te.markDirty(); - } - } - } - } - - public void dropItem(World world, double x, double y, double z, ItemStack stack) - { - EntityItem entityitem = new EntityItem(world, x + 0.5D, y + 1.5D, z + 0.5D, stack); - entityitem.motionX = 0; - entityitem.motionZ = 0; - entityitem.motionY = 0.11000000298023224D; - world.spawnEntityInWorld(entityitem); - } - - public void breakBlock(World world, int i, int j, int k, Block block, int par6) - { - TileEntityDisplayer te = (TileEntityDisplayer) world.getTileEntity(i, j, k); - - if (te != null && te.hasObject) - { - te.object.stackSize = te.quantity; - dropItem(te.getWorldObj(), (double)te.xCoord, (double)te.yCoord, (double)te.zCoord, te.object); - world.removeTileEntity(i, j, k); - } - - super.breakBlock(world, i, j, k, block, par6); - } - - @Override - public void onBlockPlacedBy(World world, int i, int j, int k, EntityLivingBase entityLiving, ItemStack par6ItemStack) - { - int rotation = MathHelper.floor_double(entityLiving.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; - world.setBlockMetadataWithNotify(i, j, k, rotation, 2); - } - - @Override - public void registerBlockIcons(IIconRegister icon) - { - this.blockIcon = icon.registerIcon("jewelrycraft:displayer"); - } -} diff --git a/eclipse/Jewelrycraft/common/darkknight/jewelrycraft/block/BlockGlow.java b/eclipse/Jewelrycraft/common/darkknight/jewelrycraft/block/BlockGlow.java deleted file mode 100644 index f8a09d4..0000000 --- a/eclipse/Jewelrycraft/common/darkknight/jewelrycraft/block/BlockGlow.java +++ /dev/null @@ -1,39 +0,0 @@ -package darkknight.jewelrycraft.block; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.world.World; - -public class BlockGlow extends Block -{ - protected BlockGlow() - { - super(Material.air); - } - - public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, int par2, int par3, int i) - { - return null; - } - - public boolean isCollidable() - { - return false; - } - - public boolean isOpaqueCube() - { - return false; - } - - public boolean renderAsNormalBlock() - { - return false; - } - - public int getRenderType() - { - return -1; - } -} diff --git a/eclipse/Jewelrycraft/common/darkknight/jewelrycraft/block/BlockJCOre.java b/eclipse/Jewelrycraft/common/darkknight/jewelrycraft/block/BlockJCOre.java deleted file mode 100644 index e6bb31c..0000000 --- a/eclipse/Jewelrycraft/common/darkknight/jewelrycraft/block/BlockJCOre.java +++ /dev/null @@ -1,15 +0,0 @@ -package darkknight.jewelrycraft.block; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.world.World; - -public class BlockJCOre extends Block -{ - protected BlockJCOre() - { - super(Material.rock); - setHarvestLevel("pickaxe", 3); - } -} diff --git a/eclipse/Jewelrycraft/common/darkknight/jewelrycraft/block/BlockJewelAltar.java b/eclipse/Jewelrycraft/common/darkknight/jewelrycraft/block/BlockJewelAltar.java deleted file mode 100644 index cbf7fef..0000000 --- a/eclipse/Jewelrycraft/common/darkknight/jewelrycraft/block/BlockJewelAltar.java +++ /dev/null @@ -1,119 +0,0 @@ -package darkknight.jewelrycraft.block; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockContainer; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import darkknight.jewelrycraft.item.ItemList; -import darkknight.jewelrycraft.tileentity.TileEntityAltar; - -public class BlockJewelAltar extends BlockContainer -{ - @SideOnly(Side.CLIENT) - private IIcon altarSide; - @SideOnly(Side.CLIENT) - private IIcon altarBottom; - @SideOnly(Side.CLIENT) - private IIcon altarTop; - - public BlockJewelAltar() - { - super(Material.iron); - } - - public static boolean isNormalCube(int par0) - { - return true; - } - - public void registerBlockIcons(IIconRegister par1IconRegister) - { - this.altarSide = par1IconRegister.registerIcon(this.getTextureName() + "_" + "side"); - this.altarBottom = par1IconRegister.registerIcon(this.getTextureName() + "_" + "bottom"); - this.altarTop = par1IconRegister.registerIcon(this.getTextureName() + "_" + "top"); - } - - public IIcon getIcon(int par1, int par2) - { - return par1 == 1 ? this.altarTop : (par1 == 0 ? this.altarBottom : this.altarSide); - } - - @Override - public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer entityPlayer, int par6, float par7, float par8, float par9) - { - TileEntityAltar te = (TileEntityAltar) world.getTileEntity(i, j, k); - ItemStack item = entityPlayer.inventory.getCurrentItem(); - if (te != null && !world.isRemote) - { - if(item != null && item != new ItemStack(Item.getItemById(0), 0, 0) && (item.getItem() == ItemList.ring || item.getItem() == ItemList.necklace) && !te.hasObject) - { - te.object = item.copy(); - item.stackSize = 0; - te.playerName = entityPlayer.getDisplayName(); - te.isDirty = true; - te.markDirty(); - te.hasObject = true; - } - - if(te.object != null && te.object != new ItemStack(Item.getItemById(0), 0, 0) && te.hasObject && entityPlayer.isSneaking()) - { - entityPlayer.inventory.addItemStackToInventory(te.object); - te.object = new ItemStack(Item.getItemById(0), 0, 0); - te.playerName = ""; - te.isDirty = true; - te.markDirty(); - te.hasObject = false; - } - } - return true; - } - - @Override - public void onBlockClicked(World world, int i, int j, int k, EntityPlayer player) - { - TileEntityAltar te = (TileEntityAltar) world.getTileEntity(i, j, k); - if (te != null && !world.isRemote) - { - if (te.object != null && te.object != new ItemStack(Item.getItemById(0), 0, 0)) - { - } - } - } - - public void dropItem(World world, double x, double y, double z, ItemStack stack) - { - EntityItem entityitem = new EntityItem(world, x + 0.5D, y + 1.5D, z + 0.5D, stack); - entityitem.motionX = 0; - entityitem.motionZ = 0; - entityitem.motionY = 0.11000000298023224D; - world.spawnEntityInWorld(entityitem); - } - - public void breakBlock(World world, int i, int j, int k, Block block, int par6) - { - TileEntityAltar te = (TileEntityAltar) world.getTileEntity(i, j, k); - - if (te != null && te.object != null && te.object != new ItemStack(Item.getItemById(0), 0, 0)) - { - dropItem(te.getWorldObj(), (double)te.xCoord, (double)te.yCoord, (double)te.zCoord, te.object); - world.removeTileEntity(i, j, k); - } - - super.breakBlock(world, i, j, k, block, par6); - } - - @Override - public TileEntity createNewTileEntity(World world, int var2) - { - return new TileEntityAltar(); - } -} diff --git a/eclipse/Jewelrycraft/common/darkknight/jewelrycraft/block/BlockJewelrsCraftingTable.java b/eclipse/Jewelrycraft/common/darkknight/jewelrycraft/block/BlockJewelrsCraftingTable.java deleted file mode 100644 index a701467..0000000 --- a/eclipse/Jewelrycraft/common/darkknight/jewelrycraft/block/BlockJewelrsCraftingTable.java +++ /dev/null @@ -1,222 +0,0 @@ -package darkknight.jewelrycraft.block; - -import java.util.Random; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockContainer; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.MathHelper; -import net.minecraft.util.StatCollector; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import darkknight.jewelrycraft.config.ConfigHandler; -import darkknight.jewelrycraft.tileentity.TileEntityJewelrsCraftingTable; -import darkknight.jewelrycraft.util.JewelrycraftUtil; - -public class BlockJewelrsCraftingTable extends BlockContainer -{ - Random rand = new Random(); - - protected BlockJewelrsCraftingTable(Material par2Material) - { - super(par2Material); - this.setBlockBounds(0.0F, 0F, 0.0F, 1.0F, 0.8F, 1.0F); - } - - @Override - public TileEntity createNewTileEntity(World world, int var2) - { - return new TileEntityJewelrsCraftingTable(); - } - - @Override - public boolean renderAsNormalBlock() - { - return false; - } - - @Override - public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer entityPlayer, int par6, float par7, float par8, float par9) - { - TileEntityJewelrsCraftingTable te = (TileEntityJewelrsCraftingTable) world.getTileEntity(i, j, k); - ItemStack item = entityPlayer.inventory.getCurrentItem(); - if (te != null && !world.isRemote) - { - if (!te.hasEndItem && !te.hasJewelry && item != null && JewelrycraftUtil.isJewelry(item)) - { - if(te.hasModifier && te.hasJewel && item.hasTagCompound() && item.getTagCompound().hasKey("modifier") && item.getTagCompound().hasKey("jewel")) - entityPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("chatmessage.Jewelrycraft.table.jewelrymodifiedfull"))); - else if(te.hasJewel && item.hasTagCompound() && item.getTagCompound().hasKey("jewel")) - entityPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("chatmessage.Jewelrycraft.table.jewelrycontainsjewel"))); - else if(te.hasModifier && item.hasTagCompound() && item.getTagCompound().hasKey("modifier")) - entityPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("chatmessage.Jewelrycraft.table.jewelrycontainsmodifier"))); - else - { - te.jewelry = item.copy(); - te.hasJewelry = true; - if (!entityPlayer.capabilities.isCreativeMode) --item.stackSize; - entityPlayer.inventory.markDirty(); - world.setTileEntity(i, j, k, te); - te.isDirty = true; - te.markDirty(); - } - } - if (!te.hasEndItem && !te.hasModifier && item != null && JewelrycraftUtil.isModifier(item)) - { - if(te.hasJewelry && te.jewelry.hasTagCompound() && te.jewelry.getTagCompound().hasKey("modifier")) - entityPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("chatmessage.Jewelrycraft.table.jewelrycontainsmodifier"))); - else - { - te.modifier = item.copy(); - te.modifier.stackSize = 1; - te.hasModifier = true; - if (!entityPlayer.capabilities.isCreativeMode) --item.stackSize; - entityPlayer.inventory.markDirty(); - world.setTileEntity(i, j, k, te); - te.isDirty = true; - te.markDirty(); - } - } - if (!te.hasEndItem && !te.hasJewel && item != null && JewelrycraftUtil.isJewel(item)) - { - if(te.hasJewelry && te.jewelry.hasTagCompound() && te.jewelry.getTagCompound().hasKey("jewel")) - entityPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("chatmessage.Jewelrycraft.table.jewelrycontainsjewel"))); - else - { - te.jewel = item.copy(); - te.jewel.stackSize = 1; - te.hasJewel = true; - if (!entityPlayer.capabilities.isCreativeMode) --item.stackSize; - entityPlayer.inventory.markDirty(); - world.setTileEntity(i, j, k, te); - te.isDirty = true; - te.markDirty(); - } - } - if (te.timer <= 0 && !te.hasEndItem && te.hasJewelry && (te.hasModifier || te.hasJewel)){ te.timer = ConfigHandler.jewelryCraftingTime; te.angle = 0;} - if (te.hasEndItem && item != null) entityPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("chatmessage.Jewelrycraft.table.hasenditem"))); - - if (te.hasModifier && entityPlayer.isSneaking()) - { - dropItem(world, (double) te.xCoord, (double) te.yCoord, (double) te.zCoord, te.modifier.copy()); - te.modifier = new ItemStack(Item.getItemById(0), 0, 0); - te.hasModifier = false; - te.timer = 0; - te.angle = 0F; - te.isDirty = true; - te.markDirty(); - world.markBlockForUpdate(i, j, k); - world.setTileEntity(i, j, k, te); - } - if (te.hasJewelry && entityPlayer.isSneaking()) - { - dropItem(world, (double) te.xCoord, (double) te.yCoord, (double) te.zCoord, te.jewelry.copy()); - te.jewelry = new ItemStack(Item.getItemById(0), 0, 0); - te.hasJewelry = false; - te.timer = 0; - te.angle = 0F; - te.isDirty = true; - te.markDirty(); - world.markBlockForUpdate(i, j, k); - world.setTileEntity(i, j, k, te); - } - if (te.hasJewel && entityPlayer.isSneaking()) - { - dropItem(world, (double) te.xCoord, (double) te.yCoord, (double) te.zCoord, te.jewel.copy()); - te.jewel = new ItemStack(Item.getItemById(0), 0, 0); - te.hasJewel = false; - te.timer = 0; - te.angle = 0F; - te.isDirty = true; - te.markDirty(); - world.markBlockForUpdate(i, j, k); - world.setTileEntity(i, j, k, te); - } - } - return true; - } - - public void dropItem(World world, double x, double y, double z, ItemStack stack) - { - EntityItem entityitem = new EntityItem(world, x + 0.5D, y + 1D, z + 0.5D, stack); - entityitem.motionX = 0; - entityitem.motionZ = 0; - entityitem.motionY = 0.21000000298023224D; - world.spawnEntityInWorld(entityitem); - } - - public void breakBlock(World world, int i, int j, int k, Block par5, int par6) - { - TileEntityJewelrsCraftingTable te = (TileEntityJewelrsCraftingTable) world.getTileEntity(i, j, k); - if (te != null) - { - if (te.hasModifier) dropItem(world, (double) te.xCoord, (double) te.yCoord, (double) te.zCoord, te.modifier.copy()); - if (te.hasJewelry) dropItem(world, (double) te.xCoord, (double) te.yCoord, (double) te.zCoord, te.jewelry.copy()); - if (te.hasJewel) dropItem(world, (double) te.xCoord, (double) te.yCoord, (double) te.zCoord, te.jewel.copy()); - if (te.hasEndItem) dropItem(te.getWorldObj(), (double) te.xCoord, (double) te.yCoord, (double) te.zCoord, te.endItem.copy()); - world.removeTileEntity(i, j, k); - } - super.breakBlock(world, i, j, k, par5, par6); - } - - @Override - public void onBlockPlacedBy(World world, int i, int j, int k, EntityLivingBase entityLiving, ItemStack par6ItemStack) - { - int rotation = MathHelper.floor_double(entityLiving.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; - world.setBlockMetadataWithNotify(i, j, k, rotation, 2); - } - - @Override - public void onBlockClicked(World world, int i, int j, int k, EntityPlayer player) - { - TileEntityJewelrsCraftingTable te = (TileEntityJewelrsCraftingTable) world.getTileEntity(i, j, k); - if (te != null && !world.isRemote) - { - if (te.hasEndItem) - { - dropItem(te.getWorldObj(), (double) te.xCoord, (double) te.yCoord, (double) te.zCoord, te.endItem.copy()); - te.endItem = new ItemStack(Item.getItemById(0), 0, 0); - te.hasEndItem = false; - te.isDirty = true; - te.markDirty(); - world.markBlockForUpdate(i, j, k); - world.setTileEntity(i, j, k, te); - } - else if (te.hasJewelry && (te.hasModifier || te.hasJewel) && te.timer > 0 && te.jewelry != null) player.addChatMessage(new ChatComponentText(StatCollector.translateToLocalFormatted("chatmessage.Jewelrycraft.table.iscrafting", te.jewelry.getDisplayName()) + " (" + ((ConfigHandler.jewelryCraftingTime - te.timer) * 100 / ConfigHandler.jewelryCraftingTime) + "%)")); - else if ((!te.hasModifier || !te.hasJewel) && !te.hasJewelry) player.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("chatmessage.Jewelrycraft.table.missingjewelryandmodifierorjewel"))); - else if (!te.hasJewelry) player.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("chatmessage.Jewelrycraft.table.missingjewelry"))); - else if (!te.hasModifier || !te.hasJewel) player.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("chatmessage.Jewelrycraft.table.missingmodifierorjewel"))); - } - } - - @Override - public boolean shouldSideBeRendered(IBlockAccess iblockaccess, int i, int j, int k, int l) - { - return false; - } - - @Override - public boolean isOpaqueCube() - { - return false; - } - - @Override - public int getRenderType() - { - return -1; - } - - public void registerBlockIcons(IIconRegister icon) - { - this.blockIcon = icon.registerIcon("jewelrycraft:jewelrsCraftingTable"); - } -} diff --git a/eclipse/Jewelrycraft/common/darkknight/jewelrycraft/block/BlockList.java b/eclipse/Jewelrycraft/common/darkknight/jewelrycraft/block/BlockList.java deleted file mode 100644 index 60d4b96..0000000 --- a/eclipse/Jewelrycraft/common/darkknight/jewelrycraft/block/BlockList.java +++ /dev/null @@ -1,68 +0,0 @@ -package darkknight.jewelrycraft.block; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.registry.GameRegistry; -import darkknight.jewelrycraft.JewelrycraftMod; -import darkknight.jewelrycraft.tileentity.TileEntityAltar; -import darkknight.jewelrycraft.tileentity.TileEntityBlockShadow; -import darkknight.jewelrycraft.tileentity.TileEntityDisplayer; -import darkknight.jewelrycraft.tileentity.TileEntityJewelrsCraftingTable; -import darkknight.jewelrycraft.tileentity.TileEntityMolder; -import darkknight.jewelrycraft.tileentity.TileEntitySmelter; - -public class BlockList -{ - public static Block shadowOre; - public static Block glow; - public static Block smelter; - public static Block molder; - public static Block displayer; - public static Block jewelCraftingTable; - public static Block shadowBlock; - public static Block jewelAltar; - public static BlockMoltenMetal moltenMetal; - public static Fluid moltenMetalFluid; - - private static boolean isInitialized = false; - - public static void preInit(FMLPreInitializationEvent e) - { - if (!isInitialized) - { - shadowOre = new BlockJCOre().setHardness(3.0F).setResistance(5.0F).setStepSound(Block.soundTypeStone).setBlockTextureName("jewelrycraft:oreShadow").setBlockName("Jewelrycraft.oreShadow").setCreativeTab(JewelrycraftMod.jewelrycraft); - glow = new BlockGlow().setBlockName("Jewelrycraft.glow").setLightLevel(1F); - smelter = new BlockSmelter(Material.rock).setHardness(5.0F).setResistance(6.0F).setStepSound(Block.soundTypeStone).setBlockName("Jewelrycraft.smelter").setCreativeTab(JewelrycraftMod.jewelrycraft); - molder = new BlockMolder(Material.rock).setHardness(5.0F).setResistance(6.0F).setStepSound(Block.soundTypeStone).setBlockName("Jewelrycraft.molder").setCreativeTab(JewelrycraftMod.jewelrycraft); - displayer = new BlockDisplayer(Material.iron).setHardness(5.0F).setResistance(6.0F).setStepSound(Block.soundTypeMetal).setBlockName("Jewelrycraft.displayer").setCreativeTab(JewelrycraftMod.jewelrycraft); - jewelCraftingTable = new BlockJewelrsCraftingTable(Material.rock).setHardness(3.0F).setResistance(5.0F).setStepSound(Block.soundTypeStone).setBlockName("Jewelrycraft.jewelCraftingTable").setCreativeTab(JewelrycraftMod.jewelrycraft); - shadowBlock = new BlockShadow().setHardness(5.0F).setResistance(7.0F).setStepSound(Block.soundTypeMetal).setBlockTextureName("jewelrycraft:blockShadow").setBlockName("Jewelrycraft.blockShadow").setCreativeTab(JewelrycraftMod.jewelrycraft); - jewelAltar = new BlockJewelAltar().setHardness(5.0F).setResistance(2.0F).setStepSound(Block.soundTypeMetal).setBlockTextureName("jewelrycraft:altar").setBlockName("Jewelrycraft.altar").setCreativeTab(JewelrycraftMod.jewelrycraft); - - GameRegistry.registerBlock(shadowOre, "shadowOre"); - GameRegistry.registerBlock(shadowBlock, "shadowBlock"); - GameRegistry.registerBlock(smelter, "Smelter"); - GameRegistry.registerBlock(molder, "Molder"); - GameRegistry.registerBlock(jewelCraftingTable, "jewelCraftingTable"); - GameRegistry.registerBlock(displayer, "Displayer"); - GameRegistry.registerBlock(jewelAltar, "Altar"); - - GameRegistry.registerTileEntity(TileEntitySmelter.class, "30"); - GameRegistry.registerTileEntity(TileEntityMolder.class, "31"); - GameRegistry.registerTileEntity(TileEntityJewelrsCraftingTable.class, "32"); - GameRegistry.registerTileEntity(TileEntityDisplayer.class, "33"); - GameRegistry.registerTileEntity(TileEntityBlockShadow.class, "34"); - GameRegistry.registerTileEntity(TileEntityAltar.class, "35"); - - moltenMetalFluid = new Fluid("metal.molten").setLuminosity(15).setDensity(3000).setTemperature(2000).setViscosity(6000); - if (!FluidRegistry.registerFluid(moltenMetalFluid)) moltenMetalFluid = FluidRegistry.getFluid("metal.molten"); - moltenMetal = new BlockMoltenMetal(moltenMetalFluid, Material.lava); - GameRegistry.registerBlock(moltenMetal, "moltenMetalLiquid"); - - isInitialized = true; - } - } -} diff --git a/eclipse/Jewelrycraft/common/darkknight/jewelrycraft/block/BlockMolder.java b/eclipse/Jewelrycraft/common/darkknight/jewelrycraft/block/BlockMolder.java deleted file mode 100644 index 1ed58d7..0000000 --- a/eclipse/Jewelrycraft/common/darkknight/jewelrycraft/block/BlockMolder.java +++ /dev/null @@ -1,151 +0,0 @@ -package darkknight.jewelrycraft.block; - -import java.util.Random; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockContainer; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.MathHelper; -import net.minecraft.util.StatCollector; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import darkknight.jewelrycraft.config.ConfigHandler; -import darkknight.jewelrycraft.item.ItemList; -import darkknight.jewelrycraft.tileentity.TileEntityMolder; - -public class BlockMolder extends BlockContainer -{ - Random rand = new Random(); - - protected BlockMolder(Material par2Material) - { - super(par2Material); - this.setBlockBounds(0.1F, 0F, 0.1F, 0.9F, 0.2F, 0.9F); - } - - @Override - public TileEntity createNewTileEntity(World world, int var2) - { - return new TileEntityMolder(); - } - - @Override - public boolean renderAsNormalBlock() - { - return false; - } - - @Override - public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer entityPlayer, int par6, float par7, float par8, float par9) - { - TileEntityMolder te = (TileEntityMolder) world.getTileEntity(i, j, k); - ItemStack item = entityPlayer.inventory.getCurrentItem(); - if (te != null && !world.isRemote) - { - if(item != null && !te.hasMold && item.getItem() == ItemList.molds) - { - te.mold = item.copy(); - te.hasMold = true; - if (!entityPlayer.capabilities.isCreativeMode) --item.stackSize; - entityPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocalFormatted("chatmessage.Jewelrycraft.molder.addedmold", te.mold.getDisplayName()))); - te.isDirty = true; - te.markDirty(); - world.markTileEntityChunkModified(i, j, k, te); - } - if (te.hasMold && entityPlayer.isSneaking() && !te.hasMoltenMetal) - { - dropItem(world, (double)te.xCoord, (double)te.yCoord, (double)te.zCoord, te.mold.copy()); - te.mold = new ItemStack(Item.getItemById(0), 0, 0); - te.hasMold = false; - te.isDirty = true; - te.markDirty(); - } - else if(te.hasMoltenMetal) entityPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("chatmessage.Jewelrycraft.molder.hasmoltenmetal"))); - } - return true; - } - - public void dropItem(World world, double x, double y, double z, ItemStack stack) - { - EntityItem entityitem = new EntityItem(world, x + 0.5D, y + 0.5D, z + 0.5D, stack); - entityitem.motionX = 0; - entityitem.motionZ = 0; - entityitem.motionY = 0.11000000298023224D; - world.spawnEntityInWorld(entityitem); - } - - public void breakBlock(World world, int i, int j, int k, Block par5, int par6) - { - TileEntityMolder te = (TileEntityMolder) world.getTileEntity(i, j, k); - - if (te != null) - { - if(te.hasJewelBase) dropItem(te.getWorldObj(), (double)te.xCoord, (double)te.yCoord, (double)te.zCoord, te.jewelBase.copy()); - if(te.hasMold) dropItem(world, (double)te.xCoord, (double)te.yCoord, (double)te.zCoord, te.mold.copy()); - world.removeTileEntity(i, j, k); - } - - super.breakBlock(world, i, j, k, par5, par6); - } - - @Override - public void onBlockPlacedBy(World world, int i, int j, int k, EntityLivingBase entityLiving, ItemStack par6ItemStack) - { - int rotation = MathHelper.floor_double(entityLiving.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; - world.setBlockMetadataWithNotify(i, j, k, rotation, 2); - } - - @Override - public void onBlockClicked(World world, int i, int j, int k, EntityPlayer player) - { - TileEntityMolder me = (TileEntityMolder) world.getTileEntity(i, j, k); - if (me != null && !world.isRemote) - { - if (me.hasJewelBase) - { - dropItem(me.getWorldObj(), (double)me.xCoord, (double)me.yCoord, (double)me.zCoord, me.jewelBase.copy()); - me.jewelBase = new ItemStack(Item.getItemById(0), 0, 0); - me.hasJewelBase = false; - } - else if (me.hasMoltenMetal && me.cooling > 0) - player.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("chatmessage.Jewelrycraft.molder.metaliscooling") + " (" + ((ConfigHandler.ingotCoolingTime - me.cooling)*100/ConfigHandler.ingotCoolingTime) + "%)")); - else if (me.mold.getItem() == ItemList.molds && !me.hasMoltenMetal) - player.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("chatmessage.Jewelrycraft.molder.moldisempty"))); - else if (me.mold.getItem() != ItemList.molds) - player.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("chatmessage.Jewelrycraft.molder.moldismissing"))); - me.isDirty = true; - me.markDirty(); - } - } - - @Override - public boolean shouldSideBeRendered(IBlockAccess iblockaccess, int i, int j, int k, int l) - { - return false; - } - - @Override - public boolean isOpaqueCube() - { - return false; - } - - @Override - public int getRenderType() - { - return -1; - } - - public void registerBlockIcons(IIconRegister icon) - { - this.blockIcon = icon.registerIcon("jewelrycraft:molder"); - } -} diff --git a/eclipse/Jewelrycraft/common/darkknight/jewelrycraft/block/BlockMoltenMetal.java b/eclipse/Jewelrycraft/common/darkknight/jewelrycraft/block/BlockMoltenMetal.java deleted file mode 100644 index 9adbf59..0000000 --- a/eclipse/Jewelrycraft/common/darkknight/jewelrycraft/block/BlockMoltenMetal.java +++ /dev/null @@ -1,117 +0,0 @@ -package darkknight.jewelrycraft.block; - -import java.awt.image.BufferedImage; -import java.io.IOException; - -import javax.imageio.ImageIO; - -import net.minecraft.block.material.Material; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.client.resources.IResourceManager; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.util.ResourceLocation; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.fluids.BlockFluidClassic; -import net.minecraftforge.fluids.Fluid; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import darkknight.jewelrycraft.util.JewelryNBT; -import darkknight.jewelrycraft.util.JewelrycraftUtil; - -public class BlockMoltenMetal extends BlockFluidClassic { - - @SideOnly(Side.CLIENT) - protected IIcon stillIcon; - @SideOnly(Side.CLIENT) - protected IIcon flowingIcon; - - public BlockMoltenMetal(Fluid fluid, Material material) { - super(fluid, material); - setBlockName("Jewelrycraft.moltenMetal"); - this.setQuantaPerBlock(100); - } - - @Override - public IIcon getIcon(int side, int meta) { - return (side == 0 || side == 1)? stillIcon : flowingIcon; - } - - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister register) { - stillIcon = register.registerIcon("jewelrycraft:moltenMetalStill"); - flowingIcon = register.registerIcon("jewelrycraft:moltenMetalFlow"); - } - - @Override - public boolean canDisplace(IBlockAccess world, int x, int y, int z) { - if (world.getBlock(x, y, z).getMaterial().isLiquid()) return false; - return super.canDisplace(world, x, y, z); - } - - @Override - public boolean displaceIfPossible(World world, int x, int y, int z) { - if (world.getBlock(x, y, z).getMaterial().isLiquid()) return false; - return super.displaceIfPossible(world, x, y, z); - } - - @SideOnly(Side.CLIENT) - public int colorMultiplier(IBlockAccess world, int i, int j, int k) - { -// try { -// return color(world, i, j, k); -// } catch (IOException e) { -// e.printStackTrace(); -// } - return 0; - } - - public static int color(IBlockAccess world, int i, int j, int k) throws IOException - { - String domain = "", texture; - IResourceManager rm = Minecraft.getMinecraft().getResourceManager(); - BufferedImage icon; - ItemStack item = new ItemStack(BlockList.moltenMetal); - JewelryNBT.addMetal(item, new ItemStack(JewelrycraftUtil.liquids.get(String.valueOf(i) + " " + String.valueOf(j) + " " + String.valueOf(k)))); - int x=0, y=0, ok = 0, red, green, blue; - if (JewelryNBT.ingot(item) != null && JewelryNBT.ingot(item).getIconIndex() != null && JewelryNBT.ingotColor(item) == 16777215) - { - String ingotIconName = JewelryNBT.ingot(item).getIconIndex().getIconName(); - - if (ingotIconName.substring(0, ingotIconName.indexOf(":") + 1) != "") domain = ingotIconName.substring(0, ingotIconName.indexOf(":") + 1).replace(":", " ").trim(); - else domain = "minecraft"; - - texture = ingotIconName.substring(ingotIconName.lastIndexOf(":") + 1) + ".png"; - ResourceLocation ingot = null; - - if (JewelryNBT.ingot(item).getUnlocalizedName().contains("item")) ingot = new ResourceLocation(domain, "textures/items/" + texture); - else ingot = new ResourceLocation(domain, "textures/blocks/" + texture); - - icon = ImageIO.read(rm.getResource(ingot).getInputStream()); - while(ok == 0) - { - red = (icon.getRGB(x, y) >> 16) & 0xFF; - green = (icon.getRGB(x, y) >> 8) & 0xFF; - blue = icon.getRGB(x, y) & 0xFF; - if((red <= 80 && green <= 80 && blue <= 80) || (red >= 180 && green >= 180 && blue >= 180)) - { - if(x=icon.getTileWidth()-1 && y 0) - player.addChatMessage(new ChatComponentText(StatCollector.translateToLocalFormatted("chatmessage.Jewelrycraft.smelter.metalismelting", te.metal.getDisplayName()) + " (" + ((ConfigHandler.ingotMeltingTime - te.melting)*100/ConfigHandler.ingotMeltingTime) + "%)")); - else if (te.hasMoltenMetal && !isConnectedToMolder(world, i, j, k)) - player.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("chatmessage.Jewelrycraft.smelter.molderismissing"))); - else if (!me.hasMold && te.hasMoltenMetal) - player.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("chatmessage.Jewelrycraft.smelter.molderhasnomold"))); - else if (me.hasMoltenMetal && te.hasMoltenMetal) - player.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("chatmessage.Jewelrycraft.smelter.molderhasmoltenmetal"))); - else if (me.hasJewelBase && te.hasMoltenMetal) - player.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("chatmessage.Jewelrycraft.smelter.modlerhasitem"))); - else - player.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("chatmessage.Jewelrycraft.smelter.empty"))); - } - - } - - public boolean isConnectedToMolder(World world, int i, int j, int k) - { - int blockMeta = world.getBlockMetadata(i, j, k); - if (blockMeta == 0 && world.getBlock(i, j, k - 1) instanceof BlockMolder) - return true; - else if (blockMeta == 1 && world.getBlock(i + 1, j, k) instanceof BlockMolder) - return true; - else if (blockMeta == 2 && world.getBlock(i, j, k + 1) instanceof BlockMolder) - return true; - else if (blockMeta == 3 && world.getBlock(i - 1, j, k) instanceof BlockMolder) - return true; - return false; - } - - @Override - public void onBlockPlacedBy(World world, int i, int j, int k, EntityLivingBase entityLiving, ItemStack par6ItemStack) - { - int rotation = MathHelper.floor_double(entityLiving.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; - world.setBlockMetadataWithNotify(i, j, k, rotation, 2); - } - - @Override - public boolean shouldSideBeRendered(IBlockAccess iblockaccess, int i, int j, int k, int l) - { - return false; - } - - @Override - public boolean isOpaqueCube() - { - return false; - } - - @Override - public int getRenderType() - { - return -1; - } - - public void registerBlockIcons(IIconRegister icon) - { - this.blockIcon = icon.registerIcon("jewelrycraft:smelter"); - } - -} -- cgit v1.2.3