diff --git a/src/tconstruct/blocks/Aggregator.java b/src/tconstruct/blocks/Aggregator.java deleted file mode 100644 index 48cc9559251..00000000000 --- a/src/tconstruct/blocks/Aggregator.java +++ /dev/null @@ -1,167 +0,0 @@ -package tconstruct.blocks; - -import java.util.List; - -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Icon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import tconstruct.TConstruct; -import tconstruct.blocks.logic.LightAggregator; -import tconstruct.common.TProxyCommon; -import tconstruct.crystal.TheftValueTracker; -import tconstruct.library.TConstructRegistry; -import tconstruct.library.blocks.InventoryBlock; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -public class Aggregator extends InventoryBlock -{ - public String[] textureNames = { "glowstone_top", "glowstone_top_inactive", "glowstone_side", "glowstone_bottom" }; - public Icon[] icons; - - public Aggregator(int id) - { - super(id, Material.iron); - setHardness(2.0f); - this.setCreativeTab(TConstructRegistry.blockTab); - //setLightValue(1.0f); - } - - @Override - public int damageDropped (int meta) - { - return meta; - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons (IconRegister iconRegister) - { - this.icons = new Icon[textureNames.length]; - - for (int i = 0; i < this.icons.length; ++i) - { - this.icons[i] = iconRegister.registerIcon("tinker:machines/aggregator_" + textureNames[i]); - } - } - - @Override - public Icon getBlockTexture (IBlockAccess iblockaccess, int x, int y, int z, int side) - { - if (side == 1) - { - LightAggregator logic = (LightAggregator) iblockaccess.getBlockTileEntity(x, y, z); - if (logic.getActive()) - return icons[0]; - else - return icons[1]; - } - return this.getIcon(side, iblockaccess.getBlockMetadata(x, y, z)); - } - - @Override - @SideOnly(Side.CLIENT) - public Icon getIcon (int side, int meta) - { - if (side == 0) - return icons[3]; - if (side == 1) - return icons[1]; - return icons[2]; - //return icons[meta]; - } - - @Override - public void onBlockPlacedBy (World world, int x, int y, int z, EntityLivingBase entityliving, ItemStack stack) - { - super.onBlockPlacedBy(world, x, y, z, entityliving, stack); - /*int range = 9; - for (int xPos = -range; xPos <= range; xPos++) - { - for (int yPos = -range; yPos <= range; yPos++) - { - for (int zPos = -range; zPos <= range; zPos++) - { - if (Math.abs(xPos) + Math.abs(yPos) + Math.abs(zPos) <= range) - { - Block block = Block.blocksList[world.getBlockId(x + xPos, y + yPos, z + zPos)]; - if (block == null || block.isAirBlock(world, x + xPos, y + yPos, z + zPos)) - world.setBlock(x + xPos, y + yPos, z + zPos, TContent.darkBlock.blockID, 1, 3); - } - } - } - }*/ - /*if (!world.isRemote) - Crystallinity.updateCrystallinity(world.provider.dimensionId, x, z, 4);*/ - } - - @Override - public void breakBlock (World world, int x, int y, int z, int par5, int par6) - { - super.breakBlock(world, x, y, z, par5, par6); - /*int range = 20; - for (int xPos = -range; xPos <= range; xPos++) - { - for (int yPos = -range; yPos <= range; yPos++) - { - for (int zPos = -range; zPos <= range; zPos++) - { - if (Math.abs(xPos) + Math.abs(yPos) + Math.abs(zPos) <= range) - { - Block block = Block.blocksList[world.getBlockId(x + xPos, y + yPos, z + zPos)]; - if (block == TContent.darkBlock || block == TContent.lightCrystalBase) - world.setBlock(x + xPos, y + yPos, z + zPos, 0, 0, 3); - } - } - } - }*/ - //Crystallinity.updateCrystallinity(world.provider.dimensionId, x, z, -4); - } - - @Override - public void getSubBlocks (int id, CreativeTabs tab, List list) - { - list.add(new ItemStack(id, 1, 0)); - /*for (int iter = 0; iter < icons.length; iter++) - { - list.add(new ItemStack(id, 1, iter)); - }*/ - } - - @Override - public TileEntity createTileEntity (World world, int metadata) - { - return new LightAggregator(); - } - - @Override - public Integer getGui (World world, int x, int y, int z, EntityPlayer entityplayer) - { - return TProxyCommon.glowstoneAggregatorID; - } - - @Override - public Object getModInstance () - { - return TConstruct.instance; - } - - @Override - public String[] getTextureNames () - { - return textureNames; - } - - /*public void updateCrystalValue (World world, int x, int y, int z) - { - GlowstoneAggregator logic = (GlowstoneAggregator) world.getBlockTileEntity(x, y, z); - logic.updateCrystalValue(); - }*/ -} diff --git a/src/tconstruct/blocks/AntiLight.java b/src/tconstruct/blocks/AntiLight.java deleted file mode 100644 index 21d6c3a9e53..00000000000 --- a/src/tconstruct/blocks/AntiLight.java +++ /dev/null @@ -1,74 +0,0 @@ -package tconstruct.blocks; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IconRegister; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.world.Explosion; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -public class AntiLight extends Block -{ - public AntiLight(int id) - { - super(id, Material.air); - float f = 0.0F; - float f1 = 0.0F; - this.setBlockBounds(0.0F + f1, 0.0F + f, 0.0F + f1, 1.0F + f1, 1.0F + f, 1.0F + f1); - } - - @Override - public int getLightOpacity (World world, int x, int y, int z) - { - return world.getBlockMetadata(x, y, z); - } - - @Override - public boolean isAirBlock (World world, int x, int y, int z) - { - return true; - } - - @Override - public boolean renderAsNormalBlock () - { - return false; - } - - @Override - public boolean isOpaqueCube () - { - return false; - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons (IconRegister par1IconRegister) - { - this.blockIcon = par1IconRegister.registerIcon("tinker:blank"); - } - - @Override - public AxisAlignedBB getCollisionBoundingBoxFromPool (World world, int x, int y, int z) - { - return null; - } - - public boolean canCollideCheck (int par1, boolean par2) - { - return false; - } - - public boolean shouldSideBeRendered (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) - { - return false; - } - - public void onBlockExploded (World world, int x, int y, int z, Explosion explosion) - { - - } -} diff --git a/src/tconstruct/blocks/CrystalBlock.java b/src/tconstruct/blocks/CrystalBlock.java deleted file mode 100644 index 544942e0c27..00000000000 --- a/src/tconstruct/blocks/CrystalBlock.java +++ /dev/null @@ -1,214 +0,0 @@ -package tconstruct.blocks; - -import java.util.List; - -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.EntityLivingBase; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Icon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import tconstruct.blocks.logic.CrystalLogic; -import tconstruct.blocks.logic.LightAggregator; -import tconstruct.client.block.CrystalBlockRender; -import tconstruct.common.TContent; -import tconstruct.crystal.Crystallinity; -import tconstruct.crystal.Crystallinity.CrystalType; -import tconstruct.library.TConstructRegistry; - -public class CrystalBlock extends BlockContainer -{ - String[] textureNames = { "lightstone" }; - Icon[] icons; - - public CrystalBlock(int id) - { - super(id, Material.glass); - this.setCreativeTab(TConstructRegistry.blockTab); - } - - @Override - public Icon getIcon (int side, int meta) - { - return icons[0]; - } - - @Override - public boolean renderAsNormalBlock () - { - return false; - } - - @Override - public boolean isOpaqueCube () - { - return false; - } - - @Override - public int getRenderType () - { - return CrystalBlockRender.model; - } - - @Override - public void getSubBlocks (int id, CreativeTabs tab, List list) - { - for (int iter = 0; iter < 16; iter++) - { - list.add(new ItemStack(id, 1, iter)); - } - } - - @Override - public void registerIcons (IconRegister iconRegister) - { - this.icons = new Icon[textureNames.length]; - - for (int i = 0; i < this.icons.length; ++i) - { - this.icons[i] = iconRegister.registerIcon("tinker:machines/" + textureNames[i]); - } - } - - @Override - public TileEntity createNewTileEntity (World world) - { - return null; - } - - @Override - public TileEntity createTileEntity (World world, int metadata) - { - return new CrystalLogic(); - } - - @Override - public int getLightValue (IBlockAccess world, int x, int y, int z) - { - //if (world.getBlockMetadata(x, y, z) == 0) - { - TileEntity logic = world.getBlockTileEntity(x, y, z); - - if (logic != null && logic instanceof CrystalLogic) - { - if (((CrystalLogic) logic).getActive()) - { - return 15; - } - } - } - return super.getLightValue(world, x, y, z); - } - - /*@Override - public void breakBlock (World world, int x, int y, int z, int par5, int meta) - { - if (meta <= 4) - { - TileEntity logic = world.getBlockTileEntity(x, y, z); - - if (logic != null && logic instanceof CrystalLogic) - { - - } - } - }*/ - - public boolean removeBlockByPlayer (World world, EntityPlayer player, int x, int y, int z) - { - player.addExhaustion(0.025F); - int meta = world.getBlockMetadata(x, y, z); - if (meta <= 5) - { - ItemStack stack = new ItemStack(this.blockID, 1, 0); - CrystalLogic logic = (CrystalLogic) world.getBlockTileEntity(x, y, z); - NBTTagCompound tag = new NBTTagCompound(); - int value = logic.getCrystalValue(); - tag.setInteger("Value", value); - Crystallinity.updateTheft(world.provider.dimensionId, x, z, -value, CrystalType.Light); - tag.setInteger("Value", 120); - stack.setTagCompound(tag); - - if (logic.growing()) - { - TileEntity aggregator = world.getBlockTileEntity(x, y - 1, z); - if (aggregator instanceof LightAggregator) - { - ((LightAggregator) aggregator).harvestCrystal(); - } - } - - for (int i = 0; i < getCrystalHeight(value); i++) - world.setBlockToAir(x, y + i, z); - - if (!player.capabilities.isCreativeMode || player.isSneaking()) - dropBlock(world, x, y, z, stack); - } - else - { - Block below = Block.blocksList[world.getBlockId(x, y - 1, z)]; - if (below == TContent.lightCrystalBase) - { - below.removeBlockByPlayer(world, player, x, y - 1, z); - } - else - world.setBlockToAir(x, y, z); - } - - return true;//world.setBlockToAir(x, y, z); - } - - public static int getCrystalHeight (int crystalValue) - { - if (crystalValue >= 440) - return 4; - if (crystalValue >= 224) - return 3; - if (crystalValue >= 80) - return 2; - - return 1; - } - - protected void dropBlock (World world, int x, int y, int z, ItemStack stack) - { - if (!world.isRemote && world.getGameRules().getGameRuleBooleanValue("doTileDrops")) - { - float f = 0.7F; - double d0 = (double) (world.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; - double d1 = (double) (world.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; - double d2 = (double) (world.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; - EntityItem entityitem = new EntityItem(world, (double) x + d0, (double) y + d1, (double) z + d2, stack); - entityitem.delayBeforeCanPickup = 10; - world.spawnEntityInWorld(entityitem); - } - } - - public void harvestBlock (World world, EntityPlayer player, int x, int y, int z, int meta) - { - /*if (meta > 4) - super.harvestBlock(world, player, x, y, z, meta);*/ - } - - @Override - public void onBlockPlacedBy (World world, int x, int y, int z, EntityLivingBase living, ItemStack stack) - { - CrystalLogic logic = (CrystalLogic) world.getBlockTileEntity(x, y, z); - logic.setActive(true); - if (stack.hasTagCompound()) - { - int value = stack.getTagCompound().getInteger("Value"); - Crystallinity.updateTheft(world.provider.dimensionId, x, z, value, CrystalType.Light); - logic.setCrystalValue(value); - } - } -} diff --git a/src/tconstruct/blocks/logic/AggregatorLogic.java b/src/tconstruct/blocks/logic/AggregatorLogic.java deleted file mode 100644 index b974ce7f9ea..00000000000 --- a/src/tconstruct/blocks/logic/AggregatorLogic.java +++ /dev/null @@ -1,11 +0,0 @@ -package tconstruct.blocks.logic; - -import tconstruct.library.blocks.InventoryLogic; - -public abstract class AggregatorLogic extends InventoryLogic -{ - public AggregatorLogic(int invSize) - { - super(invSize); - } -} diff --git a/src/tconstruct/blocks/logic/CrystalLogic.java b/src/tconstruct/blocks/logic/CrystalLogic.java deleted file mode 100644 index 61d4cb23876..00000000000 --- a/src/tconstruct/blocks/logic/CrystalLogic.java +++ /dev/null @@ -1,90 +0,0 @@ -package tconstruct.blocks.logic; - -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.INetworkManager; -import net.minecraft.network.packet.Packet; -import net.minecraft.network.packet.Packet132TileEntityData; -import net.minecraft.tileentity.TileEntity; -import tconstruct.library.util.IActiveLogic; - -public class CrystalLogic extends TileEntity implements IActiveLogic -{ - boolean active; - boolean growing; - int crystalValue; - - public int getCrystalValue () - { - return crystalValue; - } - - public void setCrystalValue (int value) - { - this.crystalValue = value; - } - - @Override - public boolean getActive () - { - return active; - } - - @Override - public void setActive (boolean flag) - { - System.out.println("Activating"); - active = flag; - } - - public boolean growing () - { - return growing; - } - - public void setGrowth (boolean flag) - { - growing = flag; - } - - @Override - public void readFromNBT (NBTTagCompound tags) - { - super.readFromNBT(tags); - readCustomNBT(tags); - } - - @Override - public void writeToNBT (NBTTagCompound tags) - { - super.writeToNBT(tags); - writeCustomNBT(tags); - } - - public void readCustomNBT (NBTTagCompound tags) - { - active = tags.getBoolean("Active"); - growing = tags.getBoolean("Growing"); - } - - public void writeCustomNBT (NBTTagCompound tags) - { - tags.setBoolean("Active", active); - tags.setBoolean("Growing", growing); - } - - /* Packets */ - @Override - public Packet getDescriptionPacket () - { - NBTTagCompound tag = new NBTTagCompound(); - writeCustomNBT(tag); - return new Packet132TileEntityData(xCoord, yCoord, zCoord, 1, tag); - } - - @Override - public void onDataPacket (INetworkManager net, Packet132TileEntityData packet) - { - readCustomNBT(packet.customParam1); - worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord); - } -} diff --git a/src/tconstruct/blocks/logic/LightAggregator.java b/src/tconstruct/blocks/logic/LightAggregator.java deleted file mode 100644 index f1d2154ff48..00000000000 --- a/src/tconstruct/blocks/logic/LightAggregator.java +++ /dev/null @@ -1,391 +0,0 @@ -package tconstruct.blocks.logic; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.INetworkManager; -import net.minecraft.network.packet.Packet; -import net.minecraft.network.packet.Packet132TileEntityData; -import net.minecraft.world.EnumSkyBlock; -import net.minecraft.world.World; -import tconstruct.common.TContent; -import tconstruct.crystal.Crystallinity; -import tconstruct.crystal.Crystallinity.CrystalType; -import tconstruct.inventory.AggregatorContainer; -import tconstruct.library.util.IActiveLogic; - -public class LightAggregator extends AggregatorLogic implements IActiveLogic -{ - short currentTime; - short maxTime = 20 * 60 * 5; - public int currentLightLevel; - public boolean active; - public int crystalValue; - boolean blocked; - - public LightAggregator() - { - super(3); - } - - @Override - public Container getGuiContainer (InventoryPlayer inventoryplayer, World world, int x, int y, int z) - { - return new AggregatorContainer(inventoryplayer, this); - } - - @Override - protected String getDefaultName () - { - return "aggregator.glowstone"; - } - - @Override - public void updateEntity () - { - if (!blocked && crystalValue < 528)// && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord)) - { - currentLightLevel = worldObj.getSavedLightValue(EnumSkyBlock.Sky, xCoord, yCoord + heightOfCrystal(), zCoord) - worldObj.skylightSubtracted; - if (currentLightLevel > 3) - { - currentTime += currentLightLevel / 3 + 1; - if (currentTime >= 540) //180 ticks * max light (15) 540 - { - currentTime = 0; - crystalValue++; - //System.out.println(crystalValue + " " + currentLightLevel); - if (!worldObj.isRemote) - growCrystal(); - } - setActive(true); - } - else - { - setActive(false); - } - } - else - { - setActive(false); - } - } - - int heightOfCrystal () - { - if (crystalValue > 440) - return 4; - if (crystalValue > 224) - return 3; - if (crystalValue > 80) - return 2; - - return 1; - } - - void growCrystal () - { - if (crystalValue == 1) - { - Block block = Block.blocksList[worldObj.getBlockId(xCoord, yCoord + 1, zCoord)]; - if (block == null || block.isAirBlock(worldObj, xCoord, yCoord + 1, zCoord)) - { - worldObj.setBlock(xCoord, yCoord + 1, zCoord, TContent.lightCrystalBase.blockID, 0, 3); - } - else - { - crystalValue--; - blocked = true; - } - } - else if (crystalValue == 8) - { - Block block = Block.blocksList[worldObj.getBlockId(xCoord, yCoord + 1, zCoord)]; - if (validBlock(block)) - { - worldObj.setBlockMetadataWithNotify(xCoord, yCoord + 1, zCoord, 1, 3); - spawnNegativeAir(1, 1); - - int value = 8; - Crystallinity.updateTheft(worldObj.provider.dimensionId, xCoord, zCoord, value, CrystalType.Light); - Crystallinity.updateCharge(worldObj.provider.dimensionId, xCoord, zCoord, -value, CrystalType.Light); - CrystalLogic crystal = (CrystalLogic) worldObj.getBlockTileEntity(xCoord, yCoord + 1, zCoord); - crystal.setCrystalValue(8); - } - } - else if (crystalValue == 24) - { - Block block = Block.blocksList[worldObj.getBlockId(xCoord, yCoord + 1, zCoord)]; - if (validBlock(block)) - { - worldObj.setBlockMetadataWithNotify(xCoord, yCoord + 1, zCoord, 2, 3); - spawnNegativeAir(2, 1); - - int value = 16; - Crystallinity.updateTheft(worldObj.provider.dimensionId, xCoord, zCoord, value, CrystalType.Light); - Crystallinity.updateCharge(worldObj.provider.dimensionId, xCoord, zCoord, -value, CrystalType.Light); - CrystalLogic crystal = (CrystalLogic) worldObj.getBlockTileEntity(xCoord, yCoord + 1, zCoord); - crystal.setCrystalValue(24); - } - } - else if (crystalValue == 48) - { - Block block = Block.blocksList[worldObj.getBlockId(xCoord, yCoord + 1, zCoord)]; - if (validBlock(block)) - { - worldObj.setBlockMetadataWithNotify(xCoord, yCoord + 1, zCoord, 3, 3); - spawnNegativeAir(3, 1); - - int value = 24; - Crystallinity.updateTheft(worldObj.provider.dimensionId, xCoord, zCoord, value, CrystalType.Light); - Crystallinity.updateCharge(worldObj.provider.dimensionId, xCoord, zCoord, -value, CrystalType.Light); - CrystalLogic crystal = (CrystalLogic) worldObj.getBlockTileEntity(xCoord, yCoord + 1, zCoord); - crystal.setCrystalValue(48); - } - } - else if (crystalValue == 80) //Transition - { - Block upperBlock = Block.blocksList[worldObj.getBlockId(xCoord, yCoord + 2, zCoord)]; - if (upperBlock == null || upperBlock.isAirBlock(worldObj, xCoord, yCoord + 2, zCoord)) - { - Block block = Block.blocksList[worldObj.getBlockId(xCoord, yCoord + 1, zCoord)]; - if (validBlock(block)) - { - worldObj.setBlockMetadataWithNotify(xCoord, yCoord + 1, zCoord, 4, 3); - worldObj.setBlock(xCoord, yCoord + 2, zCoord, TContent.lightCrystalBase.blockID, 6, 3); - spawnNegativeAir(5, 1); - - int value = 32; - Crystallinity.updateTheft(worldObj.provider.dimensionId, xCoord, zCoord, value, CrystalType.Light); - Crystallinity.updateCharge(worldObj.provider.dimensionId, xCoord, zCoord, -value, CrystalType.Light); - CrystalLogic crystal = (CrystalLogic) worldObj.getBlockTileEntity(xCoord, yCoord + 1, zCoord); - crystal.setCrystalValue(80); - } - } - else - { - crystalValue--; - blocked = true; - } - } - else if (crystalValue == 120) - { - Block block = Block.blocksList[worldObj.getBlockId(xCoord, yCoord + 1, zCoord)]; - Block upperBlock = Block.blocksList[worldObj.getBlockId(xCoord, yCoord + 2, zCoord)]; - if (validBlock(block) && validBlock(upperBlock)) - { - worldObj.setBlockMetadataWithNotify(xCoord, yCoord + 1, zCoord, 5, 3); - worldObj.setBlockMetadataWithNotify(xCoord, yCoord + 2, zCoord, 7, 3); - spawnNegativeAir(6, 1); - - int value = 40; - Crystallinity.updateTheft(worldObj.provider.dimensionId, xCoord, zCoord, value, CrystalType.Light); - Crystallinity.updateCharge(worldObj.provider.dimensionId, xCoord, zCoord, -value, CrystalType.Light); - CrystalLogic crystal = (CrystalLogic) worldObj.getBlockTileEntity(xCoord, yCoord + 1, zCoord); - crystal.setCrystalValue(120); - } - } - else if (crystalValue == 168) - { - Block block = Block.blocksList[worldObj.getBlockId(xCoord, yCoord + 2, zCoord)]; - if (validBlock(block)) - { - worldObj.setBlockMetadataWithNotify(xCoord, yCoord + 2, zCoord, 8, 3); - spawnNegativeAir(7, 1); - - int value = 48; - Crystallinity.updateTheft(worldObj.provider.dimensionId, xCoord, zCoord, value, CrystalType.Light); - Crystallinity.updateCharge(worldObj.provider.dimensionId, xCoord, zCoord, -value, CrystalType.Light); - CrystalLogic crystal = (CrystalLogic) worldObj.getBlockTileEntity(xCoord, yCoord + 1, zCoord); - crystal.setCrystalValue(168); - } - } - else if (crystalValue == 224) //Transition - { - Block upperBlock = Block.blocksList[worldObj.getBlockId(xCoord, yCoord + 3, zCoord)]; - if (upperBlock == null || upperBlock.isAirBlock(worldObj, xCoord, yCoord + 3, zCoord)) - { - Block block = Block.blocksList[worldObj.getBlockId(xCoord, yCoord + 2, zCoord)]; - if (validBlock(block)) - { - worldObj.setBlockMetadataWithNotify(xCoord, yCoord + 2, zCoord, 9, 3); - worldObj.setBlock(xCoord, yCoord + 3, zCoord, TContent.lightCrystalBase.blockID, 10, 3); - spawnNegativeAir(9, 1); - - int value = 56; - Crystallinity.updateTheft(worldObj.provider.dimensionId, xCoord, zCoord, value, CrystalType.Light); - Crystallinity.updateCharge(worldObj.provider.dimensionId, xCoord, zCoord, -value, CrystalType.Light); - CrystalLogic crystal = (CrystalLogic) worldObj.getBlockTileEntity(xCoord, yCoord + 1, zCoord); - crystal.setCrystalValue(224); - } - } - else - { - crystalValue--; - blocked = true; - } - } - else if (crystalValue == 288) - { - Block block = Block.blocksList[worldObj.getBlockId(xCoord, yCoord + 3, zCoord)]; - if (validBlock(block)) - { - worldObj.setBlockMetadataWithNotify(xCoord, yCoord + 3, zCoord, 11, 3); - spawnNegativeAir(10, 1); - - int value = 64; - Crystallinity.updateTheft(worldObj.provider.dimensionId, xCoord, zCoord, value, CrystalType.Light); - Crystallinity.updateCharge(worldObj.provider.dimensionId, xCoord, zCoord, -value, CrystalType.Light); - CrystalLogic crystal = (CrystalLogic) worldObj.getBlockTileEntity(xCoord, yCoord + 1, zCoord); - crystal.setCrystalValue(288); - } - } - else if (crystalValue == 360) - { - Block block = Block.blocksList[worldObj.getBlockId(xCoord, yCoord + 3, zCoord)]; - if (validBlock(block)) - { - worldObj.setBlockMetadataWithNotify(xCoord, yCoord + 3, zCoord, 12, 3); - spawnNegativeAir(11, 1); - - int value = 72; - Crystallinity.updateTheft(worldObj.provider.dimensionId, xCoord, zCoord, value, CrystalType.Light); - Crystallinity.updateCharge(worldObj.provider.dimensionId, xCoord, zCoord, -value, CrystalType.Light); - CrystalLogic crystal = (CrystalLogic) worldObj.getBlockTileEntity(xCoord, yCoord + 1, zCoord); - crystal.setCrystalValue(360); - } - } - else if (crystalValue == 440) //Transition - { - Block upperBlock = Block.blocksList[worldObj.getBlockId(xCoord, yCoord + 4, zCoord)]; - if (upperBlock == null || upperBlock.isAirBlock(worldObj, xCoord, yCoord + 4, zCoord)) - { - Block block = Block.blocksList[worldObj.getBlockId(xCoord, yCoord + 3, zCoord)]; - if (validBlock(block)) - { - worldObj.setBlockMetadataWithNotify(xCoord, yCoord + 3, zCoord, 13, 3); - worldObj.setBlock(xCoord, yCoord + 4, zCoord, TContent.lightCrystalBase.blockID, 14, 3); - spawnNegativeAir(13, 1); - - int value = 80; - Crystallinity.updateTheft(worldObj.provider.dimensionId, xCoord, zCoord, value, CrystalType.Light); - Crystallinity.updateCharge(worldObj.provider.dimensionId, xCoord, zCoord, -value, CrystalType.Light); - CrystalLogic crystal = (CrystalLogic) worldObj.getBlockTileEntity(xCoord, yCoord + 1, zCoord); - crystal.setCrystalValue(440); - } - } - else - { - crystalValue--; - blocked = true; - } - } - else if (crystalValue == 528) - { - Block block = Block.blocksList[worldObj.getBlockId(xCoord, yCoord + 4, zCoord)]; - if (validBlock(block)) - { - worldObj.setBlockMetadataWithNotify(xCoord, yCoord + 4, zCoord, 15, 3); - spawnNegativeAir(15, 1); - - int value = 88; - Crystallinity.updateTheft(worldObj.provider.dimensionId, xCoord, zCoord, value, CrystalType.Light); - Crystallinity.updateCharge(worldObj.provider.dimensionId, xCoord, zCoord, -value, CrystalType.Light); - CrystalLogic crystal = (CrystalLogic) worldObj.getBlockTileEntity(xCoord, yCoord + 1, zCoord); - crystal.setCrystalValue(528); - } - } - } - - public void spawnNegativeAir (int range, int darkness) - { - for (int xPos = -range; xPos <= range; xPos++) - { - for (int yPos = -range; yPos <= range; yPos++) - { - for (int zPos = -range; zPos <= range; zPos++) - { - if (Math.abs(xPos) + Math.abs(yPos) + Math.abs(zPos) <= range) - { - Block block = Block.blocksList[worldObj.getBlockId(xCoord + xPos, yCoord + yPos, zCoord + zPos)]; - if (block == null || block.isAirBlock(worldObj, xCoord + xPos, yCoord + yPos, zCoord + zPos)) - worldObj.setBlock(xCoord + xPos, yCoord + yPos, zCoord + zPos, TContent.darkBlock.blockID, darkness, 3); - } - } - } - } - } - - boolean validBlock (Block block) - { - return block == TContent.lightCrystalBase; - } - - @Override - public boolean getActive () - { - return active; - } - - @Override - public void setActive (boolean flag) - { - if (active != flag) - { - active = flag; - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - } - } - - @Override - public void readFromNBT (NBTTagCompound tags) - { - super.readFromNBT(tags); - currentTime = tags.getShort("Time"); - readCustomNBT(tags); - } - - @Override - public void writeToNBT (NBTTagCompound tags) - { - super.writeToNBT(tags); - tags.setShort("Time", currentTime); - writeCustomNBT(tags); - } - - public void readCustomNBT (NBTTagCompound tags) - { - active = tags.getBoolean("Active"); - crystalValue = tags.getInteger("CrystalValue"); - } - - public void writeCustomNBT (NBTTagCompound tags) - { - tags.setBoolean("Active", active); - tags.setInteger("CrystalValue", crystalValue); - } - - /* Packets */ - @Override - public Packet getDescriptionPacket () - { - NBTTagCompound tag = new NBTTagCompound(); - writeCustomNBT(tag); - return new Packet132TileEntityData(xCoord, yCoord, zCoord, 1, tag); - } - - @Override - public void onDataPacket (INetworkManager net, Packet132TileEntityData packet) - { - readCustomNBT(packet.customParam1); - worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord); - } - - public int harvestCrystal () - { - int tmp = crystalValue; - //TheftTracker.updateValue(worldObj.provider.dimensionId, xCoord, zCoord, -tmp, CrystalType.Light); - crystalValue = 0; - return tmp; - } -} diff --git a/src/tconstruct/client/TProxyClient.java b/src/tconstruct/client/TProxyClient.java index d907aba840b..101c6dbd840 100644 --- a/src/tconstruct/client/TProxyClient.java +++ b/src/tconstruct/client/TProxyClient.java @@ -63,7 +63,6 @@ import tconstruct.blocks.logic.DrawbridgeLogic; import tconstruct.blocks.logic.DryingRackLogic; import tconstruct.blocks.logic.FrypanLogic; -import tconstruct.blocks.logic.LightAggregator; import tconstruct.blocks.logic.PartBuilderLogic; import tconstruct.blocks.logic.PatternChestLogic; import tconstruct.blocks.logic.SmelteryLogic; @@ -104,7 +103,6 @@ import tconstruct.client.gui.CraftingStationGui; import tconstruct.client.gui.DrawbridgeGui; import tconstruct.client.gui.FrypanGui; -import tconstruct.client.gui.GlowstoneAggregatorGui; import tconstruct.client.gui.GuiManual; import tconstruct.client.gui.KnapsackGui; import tconstruct.client.gui.MiniGardyGui; @@ -191,8 +189,6 @@ public Object getClientGuiElement (int ID, EntityPlayer player, World world, int return new StencilTableGui(player.inventory, (StencilTableLogic) world.getBlockTileEntity(x, y, z), world, x, y, z); if (ID == toolForgeID) return new ToolForgeGui(player.inventory, (ToolForgeLogic) world.getBlockTileEntity(x, y, z), world, x, y, z); - if (ID == glowstoneAggregatorID) - return new GlowstoneAggregatorGui(player.inventory, (LightAggregator) world.getBlockTileEntity(x, y, z), world, x, y, z); if (ID == drawbridgeID) return new DrawbridgeGui(player.inventory, (DrawbridgeLogic) world.getBlockTileEntity(x, y, z), world, x, y, z); if (ID == landmineID) diff --git a/src/tconstruct/client/gui/GlowstoneAggregatorGui.java b/src/tconstruct/client/gui/GlowstoneAggregatorGui.java deleted file mode 100644 index 2b29ae52950..00000000000 --- a/src/tconstruct/client/gui/GlowstoneAggregatorGui.java +++ /dev/null @@ -1,48 +0,0 @@ -package tconstruct.client.gui; - -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; -import net.minecraft.world.World; - -import org.lwjgl.opengl.GL11; - -import tconstruct.blocks.logic.LightAggregator; - -public class GlowstoneAggregatorGui extends GuiContainer -{ - public LightAggregator logic; - - public GlowstoneAggregatorGui(InventoryPlayer inventoryplayer, LightAggregator aggregator, World world, int x, int y, int z) - { - super(aggregator.getGuiContainer(inventoryplayer, world, x, y, z)); - logic = aggregator; - } - - protected void drawGuiContainerForegroundLayer (int par1, int par2) - { - //fontRenderer.drawString(StatCollector.translateToLocal("aggregator.glowstone"), 60, 6, 0x404040); - fontRenderer.drawString("Lightstone Aggregator", 8, 6, 0x404040); - fontRenderer.drawString("Crystal Value: " + logic.crystalValue, 8, 16, 0x404040); - fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, (ySize - 96) + 2, 0x404040); - } - - private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/aggregator.png"); - - protected void drawGuiContainerBackgroundLayer (float f, int i, int j) - { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.func_110434_K().func_110577_a(background); - int cornerX = (width - xSize) / 2; - int cornerY = (height - ySize) / 2; - drawTexturedModalRect(cornerX, cornerY, 0, 0, xSize, ySize); - /*if (logic.fuel > 0) - { - int fuel = logic.gaugeFuelScaled(12); - drawTexturedModalRect(cornerX + 27, (cornerY + 40) - fuel, 176, 12 - fuel, 14, fuel + 2); - } - int fuelgague = logic.gaugeProgressScaled(24); - drawTexturedModalRect(cornerX + 140, cornerY + 8, 176, 14, fuelgague, 16);*/ - } -} diff --git a/src/tconstruct/common/TContent.java b/src/tconstruct/common/TContent.java index a926b030e99..9bfc059a1d9 100644 --- a/src/tconstruct/common/TContent.java +++ b/src/tconstruct/common/TContent.java @@ -30,15 +30,11 @@ import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; import tconstruct.TConstruct; -import tconstruct.blocks.Aggregator; -import tconstruct.blocks.AntiLight; import tconstruct.blocks.CastingChannelBlock; import tconstruct.blocks.CraftingSlab; import tconstruct.blocks.CraftingStationBlock; -import tconstruct.blocks.CrystalBlock; import tconstruct.blocks.DryingRack; import tconstruct.blocks.EquipBlock; -import tconstruct.blocks.EssenceExtractor; import tconstruct.blocks.GlassBlockConnected; import tconstruct.blocks.GlassBlockConnectedMeta; import tconstruct.blocks.GlassPane; @@ -68,15 +64,12 @@ import tconstruct.blocks.logic.CastingChannelLogic; import tconstruct.blocks.logic.CastingTableLogic; import tconstruct.blocks.logic.CraftingStationLogic; -import tconstruct.blocks.logic.CrystalLogic; import tconstruct.blocks.logic.DrawbridgeLogic; import tconstruct.blocks.logic.DryingRackLogic; -import tconstruct.blocks.logic.EssenceExtractorLogic; import tconstruct.blocks.logic.FaucetLogic; import tconstruct.blocks.logic.FirestarterLogic; import tconstruct.blocks.logic.FrypanLogic; import tconstruct.blocks.logic.LavaTankLogic; -import tconstruct.blocks.logic.LightAggregator; import tconstruct.blocks.logic.MultiServantLogic; import tconstruct.blocks.logic.PartBuilderLogic; import tconstruct.blocks.logic.PatternChestLogic; @@ -130,7 +123,6 @@ import tconstruct.items.blocks.GlassPaneItem; import tconstruct.items.blocks.GravelOreItem; import tconstruct.items.blocks.LavaTankItemBlock; -import tconstruct.items.blocks.LightCrystalItem; import tconstruct.items.blocks.MetalItemBlock; import tconstruct.items.blocks.MetalOreItemBlock; import tconstruct.items.blocks.MultiBrickFancyItem; @@ -342,11 +334,8 @@ public class TContent implements IFuelHandler public static Block stainedGlassClearMagicSlab; //Crystalline - public static Block aggregator; - public static Block lightCrystalBase; public static Block essenceExtractor; public static Item essenceCrystal; - public static Block darkBlock; //Liquids public static Material liquidMetal; @@ -911,22 +900,6 @@ void registerBlocks () GameRegistry.registerBlock(stainedGlassClearPane, StainedGlassClearPaneItem.class, "GlassPaneClearStained"); //Crystalline - aggregator = new Aggregator(PHConstruct.aggregator).setUnlocalizedName("Aggregator"); - aggregator.stepSound = Block.soundMetalFootstep; - GameRegistry.registerBlock(aggregator, "Aggregator"); - GameRegistry.registerTileEntity(LightAggregator.class, "LightAggregator"); - - lightCrystalBase = new CrystalBlock(PHConstruct.lightCrystalBase).setUnlocalizedName("Block.Crystal"); - lightCrystalBase.stepSound = Block.soundGlassFootstep; - GameRegistry.registerBlock(lightCrystalBase, LightCrystalItem.class, "Block.Crystal"); - GameRegistry.registerTileEntity(CrystalLogic.class, "CrystalLogic"); - - darkBlock = new AntiLight(PHConstruct.darkBlock).setUnlocalizedName("Antilight"); - GameRegistry.registerBlock(darkBlock, "Antilight"); - - essenceExtractor = new EssenceExtractor(PHConstruct.essenceExtractor).setHardness(12f).setUnlocalizedName("extractor.essence"); - GameRegistry.registerBlock(essenceExtractor, "extractor.essence"); - GameRegistry.registerTileEntity(EssenceExtractorLogic.class, "extractor.essence"); } void registerItems () diff --git a/src/tconstruct/common/TProxyCommon.java b/src/tconstruct/common/TProxyCommon.java index ae46f1255b7..b8e1ebbf814 100644 --- a/src/tconstruct/common/TProxyCommon.java +++ b/src/tconstruct/common/TProxyCommon.java @@ -29,7 +29,7 @@ public class TProxyCommon implements IGuiHandler public static int frypanGuiID = 4; public static int toolForgeID = 5; public static int smelteryGuiID = 7; - public static int glowstoneAggregatorID = 8; + public static int drawbridgeID = 9; public static int landmineID = 10; public static int craftingStationID = 11; @@ -188,8 +188,6 @@ public void addNames () LanguageRegistry.addName(TContent.hammer, "Hammer"); LanguageRegistry.addName(TContent.battleaxe, "Battleaxe"); LanguageRegistry.addName(TContent.cutlass, "Cutlass");*/ - LanguageRegistry.addName(TContent.aggregator, "Light Aggregator"); - LanguageRegistry.addName(TContent.lightCrystalBase, "Light Crystal"); LanguageRegistry.addName(TContent.knapsack, "Knapsack"); //LanguageRegistry.addName(TContent.shortbow, "Shortbow"); //LanguageRegistry.addName(TContent.arrow, "Arrow"); diff --git a/src/tconstruct/inventory/AggregatorContainer.java b/src/tconstruct/inventory/AggregatorContainer.java deleted file mode 100644 index e37ff1ce1fd..00000000000 --- a/src/tconstruct/inventory/AggregatorContainer.java +++ /dev/null @@ -1,88 +0,0 @@ -package tconstruct.inventory; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; -import tconstruct.blocks.logic.LightAggregator; - -public class AggregatorContainer extends Container -{ - public LightAggregator logic; - public int progress = 0; - public int fuel = 0; - public int fuelGague = 0; - - public AggregatorContainer(InventoryPlayer inventoryplayer, LightAggregator logic) - { - this.logic = logic; - - this.addSlotToContainer(new Slot(logic, 0, 45, 36)); - this.addSlotToContainer(new Slot(logic, 1, 80, 36)); - this.addSlotToContainer(new Slot(logic, 2, 123, 36)); - - /* Player inventory */ - for (int column = 0; column < 3; column++) - { - for (int row = 0; row < 9; row++) - { - this.addSlotToContainer(new Slot(inventoryplayer, row + column * 9 + 9, 8 + row * 18, 84 + column * 18)); - } - } - - for (int column = 0; column < 9; column++) - { - this.addSlotToContainer(new Slot(inventoryplayer, column, 8 + column * 18, 142)); - } - } - - public void addCraftingToCrafters (ICrafting par1ICrafting) - { - super.addCraftingToCrafters(par1ICrafting); - par1ICrafting.sendProgressBarUpdate(this, 0, logic.crystalValue); - } - - @Override - public boolean canInteractWith (EntityPlayer entityplayer) - { - return logic.isUseableByPlayer(entityplayer); - } - - @Override - public ItemStack transferStackInSlot (EntityPlayer player, int slotID) - { - ItemStack stack = null; - Slot slot = (Slot) this.inventorySlots.get(slotID); - - if (slot != null && slot.getHasStack()) - { - ItemStack slotStack = slot.getStack(); - stack = slotStack.copy(); - - if (slotID < logic.getSizeInventory()) - { - if (!this.mergeItemStack(slotStack, logic.getSizeInventory(), this.inventorySlots.size(), true)) - { - return null; - } - } - else if (!this.mergeItemStack(slotStack, 0, logic.getSizeInventory(), false)) - { - return null; - } - - if (slotStack.stackSize == 0) - { - slot.putStack((ItemStack) null); - } - else - { - slot.onSlotChanged(); - } - } - - return stack; - } -} diff --git a/src/tconstruct/items/blocks/LightCrystalItem.java b/src/tconstruct/items/blocks/LightCrystalItem.java deleted file mode 100644 index 878d222445f..00000000000 --- a/src/tconstruct/items/blocks/LightCrystalItem.java +++ /dev/null @@ -1,211 +0,0 @@ -package tconstruct.items.blocks; - -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import tconstruct.blocks.CrystalBlock; - -public class LightCrystalItem extends ItemBlock -{ - private int bID; - - public LightCrystalItem(int id) - { - super(id); - setMaxDamage(0); - this.bID = id + 256; - //setHasSubtypes(true); - } - - public boolean onItemUse (ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) - { - int i1 = world.getBlockId(x, y, z); - - if (i1 == Block.snow.blockID && (world.getBlockMetadata(x, y, z) & 7) < 1) - { - side = 1; - } - else if (i1 != Block.vine.blockID && i1 != Block.tallGrass.blockID && i1 != Block.deadBush.blockID - && (Block.blocksList[i1] == null || !Block.blocksList[i1].isBlockReplaceable(world, x, y, z))) - { - if (side == 0) - { - --y; - } - - if (side == 1) - { - ++y; - } - - if (side == 2) - { - --z; - } - - if (side == 3) - { - ++z; - } - - if (side == 4) - { - --x; - } - - if (side == 5) - { - ++x; - } - } - - if (stack.stackSize == 0) - { - return false; - } - else if (!player.canPlayerEdit(x, y, z, side, stack)) - { - return false; - } - else if (y == 255 && Block.blocksList[this.bID].blockMaterial.isSolid()) - { - return false; - } - else if (world.canPlaceEntityOnSide(this.bID, x, y, z, false, side, player, stack)) - { - Block block = Block.blocksList[this.bID]; - - int crystalValue = 0; - if (stack.hasTagCompound()) - { - crystalValue = stack.getTagCompound().getInteger("Value"); - } - - int placeMeta = getBaseMeta(crystalValue); - - if (placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, placeMeta)) - { - world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), block.stepSound.getPlaceSound(), - (block.stepSound.getVolume() + 1.0F) / 2.0F, block.stepSound.getPitch() * 0.8F); - --stack.stackSize; - - int height = CrystalBlock.getCrystalHeight(crystalValue); - if (height > 1) - { - int localID = world.getBlockId(x, y + 1, z); - if (localID != Block.vine.blockID && localID != Block.tallGrass.blockID && localID != Block.deadBush.blockID - && (Block.blocksList[localID] == null || !Block.blocksList[localID].isBlockReplaceable(world, x, y + 1, z))) - { - placeBlockAt(stack, player, world, x, y + 1, z, side, hitX, hitY, hitZ, secondMeta(crystalValue)); - } - } - if (height > 2) - { - int localID = world.getBlockId(x, y + 2, z); - if (localID != Block.vine.blockID && localID != Block.tallGrass.blockID && localID != Block.deadBush.blockID - && (Block.blocksList[localID] == null || !Block.blocksList[localID].isBlockReplaceable(world, x, y + 2, z))) - { - placeBlockAt(stack, player, world, x, y + 2, z, side, hitX, hitY, hitZ, thirdMeta(crystalValue)); - } - } - if (height > 3) - { - int localID = world.getBlockId(x, y + 3, z); - if (localID != Block.vine.blockID && localID != Block.tallGrass.blockID && localID != Block.deadBush.blockID - && (Block.blocksList[localID] == null || !Block.blocksList[localID].isBlockReplaceable(world, x, y + 3, z))) - { - placeBlockAt(stack, player, world, x, y + 3, z, side, hitX, hitY, hitZ, topMeta(crystalValue)); - } - } - } - - return true; - } - else - { - return false; - } - } - - int getBaseMeta (int crystalValue) - { - if (crystalValue >= 120) - { - return 5; - } - if (crystalValue >= 80) - { - return 4; - } - if (crystalValue >= 48) - { - return 3; - } - if (crystalValue >= 24) - { - return 2; - } - if (crystalValue >= 8) - { - return 1; - } - - return 0; - } - - int secondMeta (int crystalValue) - { - if (crystalValue >= 224) - { - return 9; - } - if (crystalValue >= 168) - { - return 8; - } - if (crystalValue >= 120) - { - return 7; - } - return 6; - } - - int thirdMeta (int crystalValue) - { - if (crystalValue >= 440) - { - return 13; - } - if (crystalValue >= 360) - { - return 12; - } - if (crystalValue >= 288) - { - return 11; - } - return 10; - } - - public int topMeta (int crystalValue) - { - if (crystalValue >= 528) - { - return 15; - } - return 14; - } - - public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) - { - if (stack.hasTagCompound()) - { - int value = stack.getTagCompound().getInteger("Value"); - list.add("Crystal Value: " + value); - } - } -} diff --git a/src/tconstruct/util/PHConstruct.java b/src/tconstruct/util/PHConstruct.java index 8fa2cd4cdbb..5031b0b6aab 100644 --- a/src/tconstruct/util/PHConstruct.java +++ b/src/tconstruct/util/PHConstruct.java @@ -129,8 +129,8 @@ public static void initProps (File location) moltenEnder = config.getBlock("Molten Ender", 3218).getInt(3218); //3221+ - aggregator = config.getBlock("Aggregator", 3221).getInt(3221); - lightCrystalBase = config.getBlock("Light Crystal", 3222).getInt(3222); + //3221 + //3222 glass = config.getBlock("Clear Glass", 3223).getInt(3223); stainedGlass = config.getBlock("Stained Glass", 3224).getInt(3224); stainedGlassClear = config.getBlock("Clear Stained Glass", 3225).getInt(3225); @@ -158,7 +158,7 @@ public static void initProps (File location) woodCrafterSlab = config.getBlock("Crafting Slab", 3243).getInt(3243); woolSlab1 = config.getBlock("Wool Slab 1", 3244).getInt(3244); woolSlab2 = config.getBlock("Wool Slab 2", 3245).getInt(3245); - darkBlock = config.getBlock("Antilight", 3246).getInt(3246); + //3246 castingChannel = config.getBlock("Casting Channel", 3249).getInt(3249); slimePoolBlue = config.getBlock("Liquid Blue Slime", 3235).getInt(3235); @@ -410,11 +410,8 @@ public static void initProps (File location) public static int stainedGlassClearPane; //Crystalline - public static int aggregator; - public static int lightCrystalBase; public static int essenceExtractor; public static int essenceCrystal; - public static int darkBlock; //Liquids public static int metalFlowing;