diff --git a/src/main/java/crazypants/enderio/ClientProxy.java b/src/main/java/crazypants/enderio/ClientProxy.java index 8a8f384f..a3f3b37a 100644 --- a/src/main/java/crazypants/enderio/ClientProxy.java +++ b/src/main/java/crazypants/enderio/ClientProxy.java @@ -13,6 +13,10 @@ import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.common.FMLCommonHandler; import crazypants.enderio.enderface.EnderIoRenderer; import crazypants.enderio.enderface.TileEnderIO; +import crazypants.enderio.machine.light.BlockElectricLight; +import crazypants.enderio.machine.light.ElectricLightRenderer; +import crazypants.enderio.machine.reservoir.ReservoirRenderer; +import crazypants.enderio.machine.reservoir.TileReservoir; import crazypants.enderio.material.BlockFusedQuartz; import crazypants.enderio.material.FusedQuartzFrameRenderer; import crazypants.enderio.material.FusedQuartzRenderer; @@ -81,9 +85,9 @@ public class ClientProxy extends CommonProxy { // BlockFusedQuartz.renderId = RenderingRegistry.getNextAvailableRenderId(); RenderingRegistry.registerBlockHandler(new FusedQuartzRenderer()); - // - // BlockElectricLight.renderId = RenderingRegistry.getNextAvailableRenderId(); - // RenderingRegistry.registerBlockHandler(new ElectricLightRenderer()); + + BlockElectricLight.renderId = RenderingRegistry.getNextAvailableRenderId(); + RenderingRegistry.registerBlockHandler(new ElectricLightRenderer()); // // CapacitorBankRenderer capr = new CapacitorBankRenderer(); // MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockCapacitorBank), capr); @@ -132,7 +136,7 @@ public class ClientProxy extends CommonProxy { ClientRegistry.bindTileEntitySpecialRenderer(TileEnderIO.class, eior); MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockEnderIo), eior); - // ClientRegistry.bindTileEntitySpecialRenderer(TileReservoir.class, new ReservoirRenderer(EnderIO.blockReservoir)); + ClientRegistry.bindTileEntitySpecialRenderer(TileReservoir.class, new ReservoirRenderer(EnderIO.blockReservoir)); // // HyperCubeRenderer hcr = new HyperCubeRenderer(); // ClientRegistry.bindTileEntitySpecialRenderer(TileHyperCube.class, hcr); diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index 792aefba..4f9de530 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -13,6 +13,10 @@ import cpw.mods.fml.common.event.FMLServerStoppedEvent; import cpw.mods.fml.common.network.NetworkRegistry; import crazypants.enderio.enderface.BlockEnderIO; import crazypants.enderio.enderface.ItemEnderface; +import crazypants.enderio.machine.light.BlockElectricLight; +import crazypants.enderio.machine.light.BlockLightNode; +import crazypants.enderio.machine.reservoir.BlockReservoir; +import crazypants.enderio.machine.solar.BlockSolarPanel; import crazypants.enderio.material.BlockFusedQuartz; import crazypants.enderio.material.ItemAlloy; import crazypants.enderio.material.ItemCapacitor; @@ -78,16 +82,18 @@ public class EnderIO { // // // Machines // public static BlockStirlingGenerator blockStirlingGenerator; - // public static BlockSolarPanel blockSolarPanel; - // public static BlockReservoir blockReservoir; + public static BlockSolarPanel blockSolarPanel; + public static BlockReservoir blockReservoir; + // public static BlockAlloySmelter blockAlloySmelter; // public static BlockCapacitorBank blockCapacitorBank; // public static BlockCrusher blockCrusher; // public static BlockHyperCube blockHyperCube; // public static BlockPowerMonitor blockPowerMonitor; // - // public static BlockElectricLight blockElectricLight; - // public static BlockLightNode blockLightNode; + public static BlockElectricLight blockElectricLight; + public static BlockLightNode blockLightNode; + // // public static ItemYetaWrench itemYetaWench; // public static ItemMJReader itemMJReader; @@ -132,8 +138,8 @@ public class EnderIO { // blockCustomDoubleSlab.init(); // // blockStirlingGenerator = BlockStirlingGenerator.create(); - // blockSolarPanel = BlockSolarPanel.create(); - // blockReservoir = BlockReservoir.create(); + blockSolarPanel = BlockSolarPanel.create(); + blockReservoir = BlockReservoir.create(); // blockAlloySmelter = BlockAlloySmelter.create(); // blockCapacitorBank = BlockCapacitorBank.create(); // blockCrusher = BlockCrusher.create(); @@ -149,8 +155,8 @@ public class EnderIO { // itemItemConduit = ItemItemConduit.create(); // itemMeConduit = ItemMeConduit.create(); // - // blockElectricLight = BlockElectricLight.create(); - // blockLightNode = BlockLightNode.create(); + blockElectricLight = BlockElectricLight.create(); + blockLightNode = BlockLightNode.create(); // // itemYetaWench = ItemYetaWrench.create(); // itemMJReader = ItemMJReader.create(); diff --git a/src/main/java/crazypants/enderio/enderface/BlockEio.java b/src/main/java/crazypants/enderio/enderface/BlockEio.java index 6cad372f..2863a43e 100644 --- a/src/main/java/crazypants/enderio/enderface/BlockEio.java +++ b/src/main/java/crazypants/enderio/enderface/BlockEio.java @@ -1,6 +1,7 @@ package crazypants.enderio.enderface; import net.minecraft.block.Block; +import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.tileentity.TileEntity; @@ -15,7 +16,7 @@ public abstract class BlockEio extends Block { protected final String name; protected BlockEio(String name, Class teClass) { - this(name, teClass, Material.rock); + this(name, teClass, new Material(MapColor.ironColor)); } protected BlockEio(String name, Class teClass, Material mat) { diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java b/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java index a911e47a..582b49c1 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java @@ -2,22 +2,20 @@ package crazypants.enderio.machine; import java.util.Random; +import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; 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.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; -import powercrystals.minefactoryreloaded.api.rednet.IConnectableRedNet; -import powercrystals.minefactoryreloaded.api.rednet.RedNetConnectionType; -import buildcraft.api.tools.IToolWrench; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.common.registry.GameRegistry; @@ -27,11 +25,10 @@ import crazypants.enderio.ClientProxy; import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; -import crazypants.enderio.conduit.ConduitUtil; import crazypants.render.IconUtil; import crazypants.util.Util; -public abstract class AbstractMachineBlock extends BlockContainer implements IGuiHandler, IConnectableRedNet { +public abstract class AbstractMachineBlock extends BlockContainer implements IGuiHandler { public static final IIcon[] REDSTONE_CONTROL_ICONS = new IIcon[RedstoneControlMode.values().length]; @@ -71,12 +68,12 @@ public abstract class AbstractMachineBlock exte protected final Class teClass; protected AbstractMachineBlock(ModObject mo, Class teClass) { - super(mo.id, new Material(MapColor.ironColor)); + super(new Material(MapColor.ironColor)); modObject = mo; this.teClass = teClass; setHardness(2.0F); - setStepSound(soundMetalFootstep); - setUnlocalizedName("enderio." + mo.name()); + setStepSound(soundTypeMetal); + setBlockName(mo.unlocalisedName); setCreativeTab(EnderIOTab.tabEnderIO); random = new Random(); @@ -88,11 +85,6 @@ public abstract class AbstractMachineBlock exte EnderIO.guiHandler.registerGuiHandler(getGuiId(), this); } - @Override - public TileEntity createNewTileEntity(World world) { - return null; - } - @Override public TileEntity createTileEntity(World world, int metadata) { try { @@ -106,18 +98,19 @@ public abstract class AbstractMachineBlock exte @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int par6, float par7, float par8, float par9) { - if(ConduitUtil.isToolEquipped(entityPlayer) && entityPlayer.isSneaking()) { - if(entityPlayer.getCurrentEquippedItem().getItem() instanceof IToolWrench) { - IToolWrench wrench = (IToolWrench) entityPlayer.getCurrentEquippedItem().getItem(); - if(wrench.canWrench(entityPlayer, x, y, z)) { - removeBlockByPlayer(world, entityPlayer, x, y, z); - if(entityPlayer.getCurrentEquippedItem().getItem() instanceof IToolWrench) { - ((IToolWrench) entityPlayer.getCurrentEquippedItem().getItem()).wrenchUsed(entityPlayer, x, y, z); - } - return true; - } - } - } + //TODO:1.7 + // if(ConduitUtil.isToolEquipped(entityPlayer) && entityPlayer.isSneaking()) { + // if(entityPlayer.getCurrentEquippedItem().getItem() instanceof IToolWrench) { + // IToolWrench wrench = (IToolWrench) entityPlayer.getCurrentEquippedItem().getItem(); + // if(wrench.canWrench(entityPlayer, x, y, z)) { + // removeBlockByPlayer(world, entityPlayer, x, y, z); + // if(entityPlayer.getCurrentEquippedItem().getItem() instanceof IToolWrench) { + // ((IToolWrench) entityPlayer.getCurrentEquippedItem().getItem()).wrenchUsed(entityPlayer, x, y, z); + // } + // return true; + // } + // } + // } if(entityPlayer.isSneaking()) { return false; @@ -127,30 +120,30 @@ public abstract class AbstractMachineBlock exte } @Override - public void registerIcons(IIconRegister IIconRegister) { + public void registerBlockIcons(IIconRegister iIconRegister) { iconBuffer = new IIcon[1][12]; String side = getSideIconKey(false); // first the 6 sides in OFF state - iconBuffer[0][0] = IIconRegister.registerIcon(side); - iconBuffer[0][1] = IIconRegister.registerIcon(getTopIconKey(false)); - iconBuffer[0][2] = IIconRegister.registerIcon(getBackIconKey(false)); - iconBuffer[0][3] = IIconRegister.registerIcon(getMachineFrontIconKey(false)); - iconBuffer[0][4] = IIconRegister.registerIcon(side); - iconBuffer[0][5] = IIconRegister.registerIcon(side); + iconBuffer[0][0] = iIconRegister.registerIcon(side); + iconBuffer[0][1] = iIconRegister.registerIcon(getTopIconKey(false)); + iconBuffer[0][2] = iIconRegister.registerIcon(getBackIconKey(false)); + iconBuffer[0][3] = iIconRegister.registerIcon(getMachineFrontIconKey(false)); + iconBuffer[0][4] = iIconRegister.registerIcon(side); + iconBuffer[0][5] = iIconRegister.registerIcon(side); side = getSideIconKey(true); - iconBuffer[0][6] = IIconRegister.registerIcon(side); - iconBuffer[0][7] = IIconRegister.registerIcon(getTopIconKey(true)); - iconBuffer[0][8] = IIconRegister.registerIcon(getBackIconKey(true)); - iconBuffer[0][9] = IIconRegister.registerIcon(getMachineFrontIconKey(true)); - iconBuffer[0][10] = IIconRegister.registerIcon(side); - iconBuffer[0][11] = IIconRegister.registerIcon(side); + iconBuffer[0][6] = iIconRegister.registerIcon(side); + iconBuffer[0][7] = iIconRegister.registerIcon(getTopIconKey(true)); + iconBuffer[0][8] = iIconRegister.registerIcon(getBackIconKey(true)); + iconBuffer[0][9] = iIconRegister.registerIcon(getMachineFrontIconKey(true)); + iconBuffer[0][10] = iIconRegister.registerIcon(side); + iconBuffer[0][11] = iIconRegister.registerIcon(side); } @Override - public IIcon getBlockTexture(IBlockAccess world, int x, int y, int z, int blockSide) { + public IIcon getIcon(IBlockAccess world, int x, int y, int z, int blockSide) { // used to render the block in the world TileEntity te = world.getTileEntity(x, y, z); int facing = 0; @@ -172,7 +165,7 @@ public abstract class AbstractMachineBlock exte } @Override - public void breakBlock(World world, int x, int y, int z, int par5, int par6) { + public void breakBlock(World world, int x, int y, int z, Block par5, int par6) { if(!world.isRemote && world.getGameRules().getGameRuleBooleanValue("doTileDrops")) { TileEntity ent = world.getTileEntity(x, y, z); if(ent != null) { @@ -183,26 +176,34 @@ public abstract class AbstractMachineBlock exte } } } - world.removeBlockTileEntity(x, y, z); + world.removeTileEntity(x, y, z); + } + //TODO:1.7 is this the correct mapping? @Override - public int idDropped(int par1, Random par2Random, int par3) { - return 0; + public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) { + //return Item.getItemFromBlock(this); + return null; } + // @Override + // public int idDropped(int par1, Random par2Random, int par3) { + // return 0; + // } + @Override public int quantityDropped(Random r) { return 0; } @Override - public boolean removeBlockByPlayer(World world, EntityPlayer player, int x, int y, int z) { + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) { if(!world.isRemote && !player.capabilities.isCreativeMode) { ItemStack st = new ItemStack(this); Util.dropItems(world, st, x, y, z, false); } - return super.removeBlockByPlayer(world, player, x, y, z); + return super.removedByPlayer(world, player, x, y, z); } @Override @@ -236,7 +237,7 @@ public abstract class AbstractMachineBlock exte } @Override - public void onNeighborBlockChange(World world, int x, int y, int z, int blockId) { + public void onNeighborBlockChange(World world, int x, int y, int z, Block blockId) { TileEntity ent = world.getTileEntity(x, y, z); if(ent instanceof AbstractMachineEntity) { AbstractMachineEntity te = (AbstractMachineEntity) ent; @@ -260,29 +261,6 @@ public abstract class AbstractMachineBlock exte } } - @Override - public RedNetConnectionType getConnectionType(World world, int x, int y, int z, ForgeDirection side) { - return RedNetConnectionType.PlateSingle; - } - - @Override - public int[] getOutputValues(World world, int x, int y, int z, ForgeDirection side) { - return new int[16]; - } - - @Override - public int getOutputValue(World world, int x, int y, int z, ForgeDirection side, int subnet) { - return 0; - } - - @Override - public void onInputsChanged(World world, int x, int y, int z, ForgeDirection side, int[] inputValues) { - } - - @Override - public void onInputChanged(World world, int x, int y, int z, ForgeDirection side, int inputValue) { - } - protected abstract int getGuiId(); protected abstract String getMachineFrontIconKey(boolean active); diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineContainer.java b/src/main/java/crazypants/enderio/machine/AbstractMachineContainer.java index 3ce9815b..11417283 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineContainer.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineContainer.java @@ -130,7 +130,7 @@ public abstract class AbstractMachineContainer extends Container { slot = (Slot) this.inventorySlots.get(checkIndex); itemstack1 = slot.getStack(); - if(itemstack1 != null && itemstack1.itemID == par1ItemStack.itemID + if(itemstack1 != null && itemstack1.getItem() == par1ItemStack.getItem() && (!par1ItemStack.getHasSubtypes() || par1ItemStack.getItemDamage() == itemstack1.getItemDamage()) && ItemStack.areItemStackTagsEqual(par1ItemStack, itemstack1) && slot.isItemValid(par1ItemStack)) { diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java index b672030a..a7623c4c 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java @@ -1,19 +1,18 @@ package crazypants.enderio.machine; +import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.network.packet.Packet; -import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.power.PowerHandler; import buildcraft.api.power.PowerHandler.PowerReceiver; import buildcraft.api.power.PowerHandler.Type; -import crazypants.enderio.ModObject; -import crazypants.enderio.PacketHandler; +import crazypants.enderio.EnderIO; +import crazypants.enderio.TileEntityEio; import crazypants.enderio.power.Capacitors; import crazypants.enderio.power.ICapacitor; import crazypants.enderio.power.IInternalPowerReceptor; @@ -21,7 +20,7 @@ import crazypants.enderio.power.PowerHandlerUtil; import crazypants.util.BlockCoord; import crazypants.vecmath.VecmathUtil; -public abstract class AbstractMachineEntity extends TileEntity implements IInventory, IInternalPowerReceptor, IMachine, IRedstoneModeControlable { +public abstract class AbstractMachineEntity extends TileEntityEio implements IInventory, IInternalPowerReceptor, IMachine, IRedstoneModeControlable { public short facing; @@ -97,7 +96,7 @@ public abstract class AbstractMachineEntity extends TileEntity implements IInven @Override public final boolean isItemValidForSlot(int i, ItemStack itemstack) { if(slotDefinition.isUpgradeSlot(i)) { - return itemstack.itemID == ModObject.itemBasicCapacitor.actualId && itemstack.getItemDamage() > 0; + return itemstack != null && itemstack.getItem() == EnderIO.itemBasicCapacitor && itemstack.getItemDamage() > 0; } return isMachineItemValidForSlot(i, itemstack); } @@ -221,7 +220,7 @@ public abstract class AbstractMachineEntity extends TileEntity implements IInven @Override public void updateEntity() { - + if(worldObj == null) { // sanity check return; } @@ -229,19 +228,21 @@ public abstract class AbstractMachineEntity extends TileEntity implements IInven if(worldObj.isRemote) { // check if the block on the client needs to update its texture if(isActive() != lastActive) { - worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord); + //TODO:1.7 is this ok? + //worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord); + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); } lastActive = isActive(); return; } // else is server, do all logic only on the server - - storedEnergy = powerHandler.getEnergyStored(); + + storedEnergy = (float) powerHandler.getEnergyStored(); boolean requiresClientSync = forceClientUpdate; if(forceClientUpdate) { // First update, send state to client - forceClientUpdate = false; + forceClientUpdate = false; } boolean prevRedCheck = redstoneCheckPassed; @@ -263,7 +264,7 @@ public abstract class AbstractMachineEntity extends TileEntity implements IInven // client/server connection worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); // And this will make sure our current tile entity state is saved - onInventoryChanged(); + markDirty(); } } @@ -274,13 +275,7 @@ public abstract class AbstractMachineEntity extends TileEntity implements IInven // ------------------------------------------------------------------------------ @Override - public Packet getDescriptionPacket() { - return PacketHandler.getPacket(this); - } - - @Override - public void readFromNBT(NBTTagCompound nbtRoot) { - super.readFromNBT(nbtRoot); + public void readCustomNBT(NBTTagCompound nbtRoot) { facing = nbtRoot.getShort("facing"); @@ -295,10 +290,13 @@ public abstract class AbstractMachineEntity extends TileEntity implements IInven // read in the inventories contents inventory = new ItemStack[slotDefinition.getNumSlots()]; - NBTTagList itemList = nbtRoot.getTagList("Items"); + + //TODO:1.7 + //NBTTagList itemList = nbtRoot.getTagList("Items"); + NBTTagList itemList = (NBTTagList) nbtRoot.getTag("Items"); for (int i = 0; i < itemList.tagCount(); i++) { - NBTTagCompound itemStack = (NBTTagCompound) itemList.tagAt(i); + NBTTagCompound itemStack = itemList.getCompoundTagAt(i); byte slot = itemStack.getByte("Slot"); if(slot >= 0 && slot < inventory.length) { inventory[slot] = ItemStack.loadItemStackFromNBT(itemStack); @@ -314,10 +312,10 @@ public abstract class AbstractMachineEntity extends TileEntity implements IInven } @Override - public void writeToNBT(NBTTagCompound nbtRoot) { - super.writeToNBT(nbtRoot); + public void writeCustomNBT(NBTTagCompound nbtRoot) { + nbtRoot.setShort("facing", facing); - nbtRoot.setFloat("storedEnergy", powerHandler.getEnergyStored()); + nbtRoot.setFloat("storedEnergy", (float) powerHandler.getEnergyStored()); nbtRoot.setShort("capacitorType", (short) capacitorType.ordinal()); nbtRoot.setBoolean("redstoneCheckPassed", redstoneCheckPassed); @@ -339,11 +337,6 @@ public abstract class AbstractMachineEntity extends TileEntity implements IInven // ---- Inventory // ------------------------------------------------------------------------------ - @Override - public boolean isInvNameLocalized() { - return false; - } - @Override public boolean isUseableByPlayer(EntityPlayer player) { if(worldObj == null) { @@ -381,7 +374,7 @@ public abstract class AbstractMachineEntity extends TileEntity implements IInven updateCapacitorFromSlot(); return fromStack; } - ItemStack result = new ItemStack(fromStack.itemID, amount, fromStack.getItemDamage()); + ItemStack result = new ItemStack(fromStack.getItem(), amount, fromStack.getItemDamage()); if(fromStack.stackTagCompound != null) { result.stackTagCompound = (NBTTagCompound) fromStack.stackTagCompound.copy(); } @@ -408,7 +401,7 @@ public abstract class AbstractMachineEntity extends TileEntity implements IInven private void updateCapacitorFromSlot() { ItemStack contents = inventory[slotDefinition.minUpgradeSlot]; - if(contents == null || contents.itemID != ModObject.itemBasicCapacitor.actualId) { + if(contents == null || contents.getItem() != EnderIO.itemBasicCapacitor) { setCapacitor(Capacitors.BASIC_CAPACITOR); } else { setCapacitor(Capacitors.values()[contents.getItemDamage()]); @@ -421,14 +414,14 @@ public abstract class AbstractMachineEntity extends TileEntity implements IInven } @Override - public void openChest() { + public void openInventory() { } @Override - public void closeChest() { + public void closeInventory() { } - public void onNeighborBlockChange(int blockId) { + public void onNeighborBlockChange(Block blockId) { redstoneStateDirty = true; } diff --git a/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java b/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java index 4aea811e..7a6d4a19 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java @@ -49,7 +49,7 @@ public abstract class AbstractPoweredTaskEntity extends AbstractMachineEntity im if(inventory[i] == null || inventory[i].stackSize < itemstack.stackSize) { return false; } - return itemstack.itemID == inventory[i].itemID; + return itemstack.getItem() == inventory[i].getItem(); } @Override @@ -98,9 +98,9 @@ public abstract class AbstractPoweredTaskEntity extends AbstractMachineEntity im return false; } - float used = Math.min(powerHandler.getEnergyStored(), getPowerUsePerTick()); + double used = Math.min(powerHandler.getEnergyStored(), getPowerUsePerTick()); powerHandler.setEnergy(powerHandler.getEnergyStored() - used); - currentTask.update(used); + currentTask.update((float) used); // then check if we are done if(currentTask.isComplete()) { @@ -231,7 +231,7 @@ public abstract class AbstractPoweredTaskEntity extends AbstractMachineEntity im } @Override - public void readFromNBT(NBTTagCompound nbtRoot) { + public void readCustomNBT(NBTTagCompound nbtRoot) { super.readFromNBT(nbtRoot); currentTask = PoweredTask.readFromNBT(nbtRoot.getCompoundTag("currentTask")); String uid = nbtRoot.getString("lastCompletedRecipe"); @@ -239,12 +239,12 @@ public abstract class AbstractPoweredTaskEntity extends AbstractMachineEntity im } @Override - public void writeToNBT(NBTTagCompound nbtRoot) { + public void writeCustomNBT(NBTTagCompound nbtRoot) { super.writeToNBT(nbtRoot); if(currentTask != null) { NBTTagCompound currentTaskNBT = new NBTTagCompound(); currentTask.writeToNBT(currentTaskNBT); - nbtRoot.setCompoundTag("currentTask", currentTaskNBT); + nbtRoot.setTag("currentTask", currentTaskNBT); } if(lastCompletedRecipe != null) { nbtRoot.setString("lastCompletedRecipe", lastCompletedRecipe.getUid()); diff --git a/src/main/java/crazypants/enderio/machine/GuiMachineBase.java b/src/main/java/crazypants/enderio/machine/GuiMachineBase.java index aab4ba54..90959ef6 100644 --- a/src/main/java/crazypants/enderio/machine/GuiMachineBase.java +++ b/src/main/java/crazypants/enderio/machine/GuiMachineBase.java @@ -4,11 +4,9 @@ import java.awt.Rectangle; import net.minecraft.client.gui.GuiButton; import net.minecraft.inventory.Container; -import net.minecraft.network.packet.Packet; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.common.network.PacketDispatcher; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.gui.GuiContainerBase; import crazypants.gui.GuiToolTip; @@ -73,8 +71,9 @@ public abstract class GuiMachineBase extends GuiContainerBase { } tileEntity.setRedstoneControlMode(RedstoneControlMode.values()[ordinal]); redstoneButton.setIcon(AbstractMachineBlock.getRedstoneControlIcon(tileEntity.getRedstoneControlMode())); - Packet pkt = RedstoneModePacketProcessor.getRedstoneControlPacket(tileEntity); - PacketDispatcher.sendPacketToServer(pkt); + //TODO:1.7 + // Packet pkt = RedstoneModePacketProcessor.getRedstoneControlPacket(tileEntity); + // PacketDispatcher.sendPacketToServer(pkt); } } @@ -84,7 +83,8 @@ public abstract class GuiMachineBase extends GuiContainerBase { int x = guiLeft + xSize - 5 - BUTTON_SIZE; int y = guiTop + 5; - redstoneButton = new IconButton(fontRenderer, REDSTONE_BUTTON_ID, x, y, AbstractMachineBlock.getRedstoneControlIcon(tileEntity.getRedstoneControlMode()), + redstoneButton = new IconButton(getFontRenderer(), REDSTONE_BUTTON_ID, x, y, AbstractMachineBlock.getRedstoneControlIcon(tileEntity + .getRedstoneControlMode()), RenderUtil.BLOCK_TEX); redstoneButton.setSize(BUTTON_SIZE, BUTTON_SIZE); diff --git a/src/main/java/crazypants/enderio/machine/IMachineRecipe.java b/src/main/java/crazypants/enderio/machine/IMachineRecipe.java index 6fa7b152..1241f3b1 100644 --- a/src/main/java/crazypants/enderio/machine/IMachineRecipe.java +++ b/src/main/java/crazypants/enderio/machine/IMachineRecipe.java @@ -1,9 +1,6 @@ package crazypants.enderio.machine; -import java.util.List; - import net.minecraft.item.ItemStack; -import crazypants.enderio.crafting.IEnderIoRecipe; /** * A MachineRecipe implementation must be stateless, always returning the same @@ -98,6 +95,7 @@ public interface IMachineRecipe { * * @return */ - List getAllRecipes(); + //TODO:1.7 + //List getAllRecipes(); } diff --git a/src/main/java/crazypants/enderio/machine/MachineRecipeRegistry.java b/src/main/java/crazypants/enderio/machine/MachineRecipeRegistry.java index 1c094b59..04fce8eb 100644 --- a/src/main/java/crazypants/enderio/machine/MachineRecipeRegistry.java +++ b/src/main/java/crazypants/enderio/machine/MachineRecipeRegistry.java @@ -6,10 +6,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.relauncher.Side; -import crazypants.enderio.crafting.RecipeReigistry; - public class MachineRecipeRegistry { public static final MachineRecipeRegistry instance = new MachineRecipeRegistry(); @@ -18,10 +14,11 @@ public class MachineRecipeRegistry { public void registerRecipe(String machine, IMachineRecipe recipe) { getRecipesForMachine(machine).put(recipe.getUid(), recipe); - Side side = FMLCommonHandler.instance().getEffectiveSide(); - if(side == Side.CLIENT) { - RecipeReigistry.instance.registerRecipes(recipe.getAllRecipes()); - } + //TODO:1.7 + // Side side = FMLCommonHandler.instance().getEffectiveSide(); + // if(side == Side.CLIENT) { + // RecipeReigistry.instance.registerRecipes(recipe.getAllRecipes()); + // } } public Map getRecipesForMachine(String machineName) { diff --git a/src/main/java/crazypants/enderio/machine/MachineRecipes.java b/src/main/java/crazypants/enderio/machine/MachineRecipes.java index e82b4213..92a3d6d2 100644 --- a/src/main/java/crazypants/enderio/machine/MachineRecipes.java +++ b/src/main/java/crazypants/enderio/machine/MachineRecipes.java @@ -1,27 +1,19 @@ package crazypants.enderio.machine; -import static crazypants.enderio.ModObject.blockAlloySmelter; -import static crazypants.enderio.ModObject.blockCapacitorBank; -import static crazypants.enderio.ModObject.blockCrusher; -import static crazypants.enderio.ModObject.blockElectricLight; -import static crazypants.enderio.ModObject.blockPainter; -import static crazypants.enderio.ModObject.blockReservoir; -import static crazypants.enderio.ModObject.blockSolarPanel; -import static crazypants.enderio.ModObject.blockStirlingGenerator; -import static crazypants.enderio.ModObject.itemBasicCapacitor; -import static crazypants.enderio.ModObject.itemPowerConduit; -import static crazypants.enderio.ModObject.itemRedstoneConduit; +import static crazypants.enderio.EnderIO.itemBasicCapacitor; import java.util.ArrayList; import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; import cpw.mods.fml.common.registry.GameRegistry; import crazypants.enderio.Config; -import crazypants.enderio.ModObject; +import crazypants.enderio.EnderIO; import crazypants.enderio.material.Alloy; import crazypants.enderio.material.MachinePart; import crazypants.enderio.material.Material; @@ -31,87 +23,87 @@ public class MachineRecipes { public static void addRecipes() { //Common ingredients - ItemStack conduitBinder = new ItemStack(ModObject.itemMaterial.actualId, 4, Material.CONDUIT_BINDER.ordinal()); - ItemStack silicon = new ItemStack(ModObject.itemMaterial.actualId, 4, Material.SILICON.ordinal()); - ItemStack capacitor = new ItemStack(itemBasicCapacitor.actualId, 1, 0); - ItemStack enderCapacitor = new ItemStack(itemBasicCapacitor.actualId, 1, Capacitors.ENDER_CAPACITOR.ordinal()); - ItemStack basicGear = new ItemStack(ModObject.itemMachinePart.actualId, 1, MachinePart.BASIC_GEAR.ordinal()); - ItemStack machineChassi = new ItemStack(ModObject.itemMachinePart.actualId, 1, MachinePart.MACHINE_CHASSI.ordinal()); + ItemStack conduitBinder = new ItemStack(EnderIO.itemMaterial, 4, Material.CONDUIT_BINDER.ordinal()); + ItemStack silicon = new ItemStack(EnderIO.itemMaterial, 4, Material.SILICON.ordinal()); + ItemStack capacitor = new ItemStack(itemBasicCapacitor, 1, 0); + ItemStack enderCapacitor = new ItemStack(itemBasicCapacitor, 1, Capacitors.ENDER_CAPACITOR.ordinal()); + ItemStack basicGear = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.BASIC_GEAR.ordinal()); + ItemStack machineChassi = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.MACHINE_CHASSI.ordinal()); //stirling gen - ItemStack stirlingGen = new ItemStack(blockStirlingGenerator.actualId, 1, 0); - GameRegistry.addShapedRecipe(stirlingGen, "bbb", "bfb", "gpg", 'b', Block.stoneBrick, 'f', Block.furnaceIdle, 'p', Block.pistonBase, 'g', basicGear); + ItemStack stirlingGen = new ItemStack(EnderIO.blockStirlingGenerator, 1, 0); + GameRegistry.addShapedRecipe(stirlingGen, "bbb", "bfb", "gpg", 'b', Blocks.stonebrick, 'f', Blocks.furnace, 'p', Blocks.piston, 'g', basicGear); //reservoir - ItemStack fusedQuartz = new ItemStack(ModObject.blockFusedQuartz.actualId, 1, 0); - ItemStack reservoir = new ItemStack(blockReservoir.actualId, 2, 0); + ItemStack fusedQuartz = new ItemStack(EnderIO.blockFusedQuartz, 1, 0); + ItemStack reservoir = new ItemStack(EnderIO.blockReservoir, 2, 0); ItemStack glassSides; if(Config.useHardRecipes) { glassSides = fusedQuartz; } else { - glassSides = new ItemStack(Block.thinGlass, 1, 0); + glassSides = new ItemStack(Blocks.glass_pane, 1, 0); } - GameRegistry.addShapedRecipe(reservoir, "gfg", "gcg", "gfg", 'g', glassSides, 'c', Item.cauldron, 'f', fusedQuartz); + GameRegistry.addShapedRecipe(reservoir, "gfg", "gcg", "gfg", 'g', glassSides, 'c', Items.cauldron, 'f', fusedQuartz); //mill - ItemStack crusher = new ItemStack(blockCrusher.actualId, 1, 0); + ItemStack crusher = new ItemStack(EnderIO.blockCrusher, 1, 0); if(Config.useHardRecipes) { - GameRegistry.addShapedRecipe(crusher, "ooo", "fpf", "cmc", 'f', Item.flint, 'm', machineChassi, 'i', Item.ingotIron, 'c', capacitor, 'p', - Block.pistonBase, - 'o', Block.obsidian); + GameRegistry.addShapedRecipe(crusher, "ooo", "fpf", "cmc", 'f', Items.flint, 'm', machineChassi, 'i', Items.iron_ingot, 'c', capacitor, 'p', + Blocks.piston, + 'o', Blocks.obsidian); } else { - GameRegistry.addShapedRecipe(crusher, "fff", "imi", "ici", 'f', Item.flint, 'm', machineChassi, 'i', Item.ingotIron, 'c', capacitor); + GameRegistry.addShapedRecipe(crusher, "fff", "imi", "ici", 'f', Items.flint, 'm', machineChassi, 'i', Items.iron_ingot, 'c', capacitor); } //transceiver - ItemStack transceiver = new ItemStack(ModObject.blockHyperCube.actualId, 1, 0); - ItemStack obsidian = new ItemStack(Block.obsidian); - ItemStack phasedGold = new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.PHASED_GOLD.ordinal()); + ItemStack transceiver = new ItemStack(EnderIO.blockHyperCube, 1, 0); + ItemStack obsidian = new ItemStack(Blocks.obsidian); + ItemStack phasedGold = new ItemStack(EnderIO.itemAlloy, 1, Alloy.PHASED_GOLD.ordinal()); GameRegistry - .addShapedRecipe(transceiver, "oeo", "pdp", "oco", 'o', obsidian, 'e', Item.eyeOfEnder, 'c', enderCapacitor, 'p', phasedGold, 'd', Item.diamond); + .addShapedRecipe(transceiver, "oeo", "pdp", "oco", 'o', obsidian, 'e', Items.ender_eye, 'c', enderCapacitor, 'p', phasedGold, 'd', Items.diamond); //solar panel if(Config.photovoltaicCellEnabled) { - ItemStack energeticAlloy = new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.ENERGETIC_ALLOY.ordinal()); - ItemStack solarPanel = new ItemStack(blockSolarPanel.actualId, 1, 0); + ItemStack energeticAlloy = new ItemStack(EnderIO.itemAlloy, 1, Alloy.ENERGETIC_ALLOY.ordinal()); + ItemStack solarPanel = new ItemStack(EnderIO.blockSolarPanel, 1, 0); if(Config.useHardRecipes) { - GameRegistry.addRecipe(new ShapedOreRecipe(solarPanel, "efe", "pfp", "cdc", 'd', Block.daylightSensor, 'f', fusedQuartz, 'c', capacitor, 'e', + GameRegistry.addRecipe(new ShapedOreRecipe(solarPanel, "efe", "pfp", "cdc", 'd', Blocks.daylight_detector, 'f', fusedQuartz, 'c', capacitor, 'e', energeticAlloy, 'p', phasedGold)); } else { - GameRegistry.addRecipe(new ShapedOreRecipe(solarPanel, "efe", "efe", "cdc", 'd', Block.daylightSensor, 'f', fusedQuartz, 'c', "dustCoal", 'e', + GameRegistry.addRecipe(new ShapedOreRecipe(solarPanel, "efe", "efe", "cdc", 'd', Blocks.daylight_detector, 'f', fusedQuartz, 'c', "dustCoal", 'e', energeticAlloy)); } } //MJ Monitor - ItemStack mJReader = new ItemStack(ModObject.itemMJReader.actualId, 1, 0); - ItemStack powerConduit = new ItemStack(itemPowerConduit.actualId, 1, 0); - ItemStack redstoneConduit = new ItemStack(itemRedstoneConduit.actualId, 1, 2); - ItemStack mJMonitor = new ItemStack(ModObject.blockPowerMonitor.actualId, 1, 0); + ItemStack mJReader = new ItemStack(EnderIO.itemMJReader, 1, 0); + ItemStack powerConduit = new ItemStack(EnderIO.itemPowerConduit, 1, 0); + ItemStack redstoneConduit = new ItemStack(EnderIO.itemRedstoneConduit, 1, 2); + ItemStack mJMonitor = new ItemStack(EnderIO.blockPowerMonitor, 1, 0); GameRegistry - .addShapedRecipe(mJMonitor, "bmb", "bMb", "bcb", 'b', Block.stoneBrick, 'e', Item.eyeOfEnder, 'M', machineChassi, 'm', mJReader, 'p', powerConduit, + .addShapedRecipe(mJMonitor, "bmb", "bMb", "bcb", 'b', Blocks.stonebrick, 'e', Items.ender_eye, 'M', machineChassi, 'm', mJReader, 'p', powerConduit, 'r', redstoneConduit, 'c', capacitor); } public static void addOreDictionaryRecipes() { - ItemStack capacitor = new ItemStack(itemBasicCapacitor.actualId, 1, 0); - ItemStack alloySmelter = new ItemStack(blockAlloySmelter.actualId, 1, 0); - ItemStack machineChassi = new ItemStack(ModObject.itemMachinePart.actualId, 1, MachinePart.MACHINE_CHASSI.ordinal()); - ItemStack fusedQuartz = new ItemStack(ModObject.blockFusedQuartz.actualId, 1, 0); + ItemStack capacitor = new ItemStack(itemBasicCapacitor, 1, 0); + ItemStack alloySmelter = new ItemStack(EnderIO.blockAlloySmelter, 1, 0); + ItemStack machineChassi = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.MACHINE_CHASSI.ordinal()); + ItemStack fusedQuartz = new ItemStack(EnderIO.blockFusedQuartz, 1, 0); //alloy smelter if(Config.useHardRecipes) { - GameRegistry.addShapedRecipe(alloySmelter, "nnn", "nfn", "CmC", 'o', Block.netherBrick, 'm', machineChassi, 'f', Block.furnaceIdle, 'C', capacitor, 'n', - Block.netherBrick); + GameRegistry.addShapedRecipe(alloySmelter, "nnn", "nfn", "CmC", 'o', Blocks.nether_brick, 'm', machineChassi, 'f', Blocks.furnace, 'C', capacitor, 'n', + Blocks.nether_brick); } else { ArrayList copperIngots = OreDictionary.getOres("ingotCopper"); if(copperIngots != null && !copperIngots.isEmpty()) { - GameRegistry.addRecipe(new ShapedOreRecipe(alloySmelter, "bfb", "cmc", "cCc", 'c', "ingotCopper", 'm', machineChassi, 'b', Block.stoneBrick, 'f', - Block.furnaceIdle, 'C', capacitor)); + GameRegistry.addRecipe(new ShapedOreRecipe(alloySmelter, "bfb", "cmc", "cCc", 'c', "ingotCopper", 'm', machineChassi, 'b', Blocks.stonebrick, 'f', + Blocks.furnace, 'C', capacitor)); } else { - GameRegistry.addShapedRecipe(alloySmelter, "bfb", "imi", "iCi", 'i', Item.ingotIron, 'm', machineChassi, 'b', Block.stoneBrick, 'f', - Block.furnaceIdle, 'C', capacitor); + GameRegistry.addShapedRecipe(alloySmelter, "bfb", "imi", "iCi", 'i', Items.iron_ingot, 'm', machineChassi, 'b', Blocks.stonebrick, 'f', + Blocks.furnace, 'C', capacitor); } } @@ -120,22 +112,22 @@ public class MachineRecipes { if(tinIngots != null && !tinIngots.isEmpty()) { metal = "ingotTin"; } else { - metal = Item.ingotIron; + metal = Items.iron_ingot; } //painter - ItemStack painter = new ItemStack(blockPainter.actualId, 1, 0); + ItemStack painter = new ItemStack(EnderIO.blockPainter, 1, 0); if(Config.useHardRecipes) { GameRegistry.addRecipe(new ShapedOreRecipe(painter, "qqq", "mdm", "CMC", 'm', metal, 'M', machineChassi, 'q', Item.netherQuartz, 'd', Item.diamond, - 'C', capacitor, 'q', Item.netherQuartz, 'd', Item.diamond)); + 'C', capacitor, 'q', Items.quartz, 'd', Items.diamond)); } else { GameRegistry.addRecipe(new ShapedOreRecipe(painter, "qdq", "mMm", "mCm", 'm', metal, 'M', machineChassi, 'q', Item.netherQuartz, 'd', Item.diamond, - 'C', capacitor, 'q', Item.netherQuartz, 'd', Item.diamond)); + 'C', capacitor, 'q', Items.quartz, 'd', Items.diamond)); } //capacitor bank - ItemStack capacitorBank = new ItemStack(blockCapacitorBank.actualId, 1, 0); - ItemStack activatedCapacitor = new ItemStack(itemBasicCapacitor.actualId, 1, 1); + ItemStack capacitorBank = new ItemStack(EnderIO.blockCapacitorBank, 1, 0); + ItemStack activatedCapacitor = new ItemStack(itemBasicCapacitor, 1, 1); if(Config.useHardRecipes) { GameRegistry.addRecipe(new ShapedOreRecipe(capacitorBank, "rcr", "ccc", "rMr", 'm', metal, 'c', activatedCapacitor, 'r', Block.blockRedstone, 'M', machineChassi)); @@ -144,12 +136,12 @@ public class MachineRecipes { } //light - ItemStack poweredLamp = new ItemStack(blockElectricLight.actualId, 1, 0); - ItemStack glowstone = new ItemStack(Item.glowstone); + ItemStack poweredLamp = new ItemStack(EnderIO.blockElectricLight, 1, 0); + ItemStack glowstone = new ItemStack(Items.glowstone_dust); ArrayList siliconEntries = OreDictionary.getOres("itemSilicon"); Object silicon; if(siliconEntries == null || siliconEntries.isEmpty()) { - silicon = new ItemStack(ModObject.itemMaterial.actualId, 1, Material.SILICON.ordinal()); + silicon = new ItemStack(EnderIO.itemMaterial, 1, Material.SILICON.ordinal()); } else { silicon = "itemSilicon"; } @@ -162,13 +154,13 @@ public class MachineRecipes { } //MJ Reader - ItemStack mJReader = new ItemStack(ModObject.itemMJReader.actualId, 1, 0); - ItemStack electricalSteel = new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.ELECTRICAL_STEEL.ordinal()); - ItemStack powerConduit = new ItemStack(itemPowerConduit.actualId, 1, 0); - ItemStack redstoneConduit = new ItemStack(itemRedstoneConduit.actualId, 1, 2); + ItemStack mJReader = new ItemStack(EnderIO.itemMJReader, 1, 0); + ItemStack electricalSteel = new ItemStack(EnderIO.itemAlloy, 1, Alloy.ELECTRICAL_STEEL.ordinal()); + ItemStack powerConduit = new ItemStack(EnderIO.itemPowerConduit, 1, 0); + ItemStack redstoneConduit = new ItemStack(EnderIO.itemRedstoneConduit, 1, 2); - GameRegistry.addRecipe(new ShapedOreRecipe(mJReader, "epe", "gcg", "srs", 'p', powerConduit, 'r', redstoneConduit, 'c', Item.comparator, 'g', - Block.thinGlass, 's', silicon, 'e', + GameRegistry.addRecipe(new ShapedOreRecipe(mJReader, "epe", "gcg", "srs", 'p', powerConduit, 'r', redstoneConduit, 'c', Items.comparator, 'g', + Blocks.glass_pane, 's', silicon, 'e', electricalSteel)); } } \ No newline at end of file diff --git a/src/main/java/crazypants/enderio/machine/PoweredTask.java b/src/main/java/crazypants/enderio/machine/PoweredTask.java index 4aff61b4..a9e5724d 100644 --- a/src/main/java/crazypants/enderio/machine/PoweredTask.java +++ b/src/main/java/crazypants/enderio/machine/PoweredTask.java @@ -1,7 +1,6 @@ package crazypants.enderio.machine; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.util.MathHelper; @@ -105,15 +104,15 @@ public class PoweredTask { if(inputSlots == null || inputSlots.length <= 0) { return null; } - NBTTagList inputItems = nbtRoot.getTagList(KEY_INPUTS_STACKS); + NBTTagList inputItems = (NBTTagList) nbtRoot.getTag(KEY_INPUTS_STACKS); if(inputItems == null || inputItems.tagCount() != inputSlots.length) { return null; } MachineRecipeInput[] inputs = new MachineRecipeInput[inputSlots.length]; for (int i = 0; i < inputSlots.length; i++) { - NBTBase stackTag = inputItems.tagAt(i); - ItemStack item = ItemStack.loadItemStackFromNBT((NBTTagCompound) stackTag); + NBTTagCompound stackTag = inputItems.getCompoundTagAt(i); + ItemStack item = ItemStack.loadItemStackFromNBT(stackTag); inputs[i] = new MachineRecipeInput(inputSlots[i], item); } diff --git a/src/main/java/crazypants/enderio/machine/RedstoneControlMode.java b/src/main/java/crazypants/enderio/machine/RedstoneControlMode.java index ba55e492..cca71877 100644 --- a/src/main/java/crazypants/enderio/machine/RedstoneControlMode.java +++ b/src/main/java/crazypants/enderio/machine/RedstoneControlMode.java @@ -34,7 +34,7 @@ public enum RedstoneControlMode { } public static boolean isConditionMet(RedstoneControlMode redstoneControlMode, TileEntity te) { - return isConditionMet(redstoneControlMode, te.worldObj.getStrongestIndirectPower(te.xCoord, te.yCoord, te.zCoord)); + return isConditionMet(redstoneControlMode, te.getWorldObj().getStrongestIndirectPower(te.xCoord, te.yCoord, te.zCoord)); } public RedstoneControlMode next() { diff --git a/src/main/java/crazypants/enderio/machine/light/BlockElectricLight.java b/src/main/java/crazypants/enderio/machine/light/BlockElectricLight.java index b7dbd10f..e302d2b5 100644 --- a/src/main/java/crazypants/enderio/machine/light/BlockElectricLight.java +++ b/src/main/java/crazypants/enderio/machine/light/BlockElectricLight.java @@ -1,8 +1,6 @@ package crazypants.enderio.machine.light; import net.minecraft.block.Block; -import net.minecraft.block.ITileEntityProvider; -import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; @@ -13,11 +11,11 @@ import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; +import crazypants.enderio.enderface.BlockEio; import crazypants.vecmath.Vector3f; -public class BlockElectricLight extends Block implements ITileEntityProvider { +public class BlockElectricLight extends BlockEio { private static final float BLOCK_HEIGHT = 0.05f; private static final float BLOCK_WIDTH = 0.3f; @@ -37,16 +35,14 @@ public class BlockElectricLight extends Block implements ITileEntityProvider { private IIcon blockIconSide; public BlockElectricLight() { - super(ModObject.blockElectricLight.id, Material.rock); - setHardness(2.0F); - setStepSound(soundGlassFootstep); - setUnlocalizedName("enderio." + ModObject.blockElectricLight.name()); - setCreativeTab(EnderIOTab.tabEnderIO); + super(ModObject.blockElectricLight.unlocalisedName, TileElectricLight.class); + setLightOpacity(0); - setLightValue(0); + //setLightValue(0); setBlockBounds(BLOCK_EDGE_MIN, 0.0F, BLOCK_EDGE_MIN, BLOCK_EDGE_MAX, BLOCK_HEIGHT, BLOCK_EDGE_MAX); } + @Override protected void init() { GameRegistry.registerBlock(this, ModObject.blockElectricLight.unlocalisedName); GameRegistry.registerTileEntity(TileElectricLight.class, ModObject.blockElectricLight.unlocalisedName + "TileEntity"); @@ -58,15 +54,15 @@ public class BlockElectricLight extends Block implements ITileEntityProvider { } @Override - public void registerIcons(IIconRegister IIconRegister) { - blockIcon = IIconRegister.registerIcon("enderio:blockElectricLightFace"); - blockIconOff = IIconRegister.registerIcon("enderio:blockElectricLightFaceOff"); - blockIconSide = IIconRegister.registerIcon("enderio:conduitConnector"); + public void registerBlockIcons(IIconRegister iIconRegister) { + blockIcon = iIconRegister.registerIcon("enderio:blockElectricLightFace"); + blockIconOff = iIconRegister.registerIcon("enderio:blockElectricLightFaceOff"); + blockIconSide = iIconRegister.registerIcon("enderio:conduitConnector"); } @Override @SideOnly(Side.CLIENT) - public IIcon getBlockTexture(IBlockAccess blockAccess, int x, int y, int z, int side) { + public IIcon getIcon(IBlockAccess blockAccess, int x, int y, int z, int side) { TileEntity te = blockAccess.getTileEntity(x, y, z); if(te instanceof TileElectricLight) { @@ -101,7 +97,7 @@ public class BlockElectricLight extends Block implements ITileEntityProvider { @Override public int getLightValue(IBlockAccess world, int x, int y, int z) { - Block block = blocksList[world.getBlockId(x, y, z)]; + Block block = world.getBlock(x, y, z); if(block != null && block != this) { return block.getLightValue(world, x, y, z); } @@ -179,7 +175,7 @@ public class BlockElectricLight extends Block implements ITileEntityProvider { } @Override - public void onNeighborBlockChange(World world, int x, int y, int z, int blockID) { + public void onNeighborBlockChange(World world, int x, int y, int z, Block blockID) { TileEntity te = world.getTileEntity(x, y, z); if(te instanceof TileElectricLight) { ((TileElectricLight) te).onNeighborBlockChange(blockID); @@ -187,17 +183,12 @@ public class BlockElectricLight extends Block implements ITileEntityProvider { } @Override - public void breakBlock(World world, int x, int y, int z, int par5, int par6) { + public void breakBlock(World world, int x, int y, int z, Block par5, int par6) { TileElectricLight te = (TileElectricLight) world.getTileEntity(x, y, z); if(te != null) { te.onBlockRemoved(); } - world.removeBlockTileEntity(x, y, z); - } - - @Override - public TileEntity createNewTileEntity(World world) { - return new TileElectricLight(); + world.removeTileEntity(x, y, z); } } diff --git a/src/main/java/crazypants/enderio/machine/light/BlockLightNode.java b/src/main/java/crazypants/enderio/machine/light/BlockLightNode.java index 6908eb0d..bbe41023 100644 --- a/src/main/java/crazypants/enderio/machine/light/BlockLightNode.java +++ b/src/main/java/crazypants/enderio/machine/light/BlockLightNode.java @@ -1,18 +1,14 @@ package crazypants.enderio.machine.light; import net.minecraft.block.Block; -import net.minecraft.block.ITileEntityProvider; -import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.LanguageRegistry; import crazypants.enderio.ModObject; +import crazypants.enderio.enderface.BlockEio; -public class BlockLightNode extends Block implements ITileEntityProvider { +public class BlockLightNode extends BlockEio { public static BlockLightNode create() { BlockLightNode result = new BlockLightNode(); @@ -21,13 +17,8 @@ public class BlockLightNode extends Block implements ITileEntityProvider { } public BlockLightNode() { - super(ModObject.blockLightNode.id, Material.rock); - setHardness(2.0F); - setStepSound(soundGlassFootstep); - setUnlocalizedName(ModObject.blockLightNode.unlocalisedName); - setLightOpacity(0); - setLightValue(0); - // setBlockBounds(0.45f, 0.45F, 0.45f, 0.55f, 0.55f, 0.55f); + super(ModObject.blockLightNode.unlocalisedName, TileLightNode.class); + setCreativeTab(null); setBlockBounds(0, 0, 0, 0, 0, 0); } @@ -43,8 +34,8 @@ public class BlockLightNode extends Block implements ITileEntityProvider { @Override public boolean isBlockSolid(IBlockAccess iblockaccess, int x, int y, int z, int l) { - int blockID = iblockaccess.getBlockId(x, y, z); - if(blockID == this.blockID) { + Block blockID = iblockaccess.getBlock(x, y, z); + if(blockID == this) { return false; } else { @@ -58,23 +49,23 @@ public class BlockLightNode extends Block implements ITileEntityProvider { } @Override - public boolean isBlockReplaceable(World world, int x, int y, int z) { + public boolean isReplaceable(IBlockAccess world, int x, int y, int z) { return true; } @Override - public void breakBlock(World world, int x, int y, int z, int par5, int par6) { + public void breakBlock(World world, int x, int y, int z, Block par5, int par6) { TileLightNode te = (TileLightNode) world.getTileEntity(x, y, z); if(te != null) { te.onBlockRemoved(); } - world.removeBlockTileEntity(x, y, z); + world.removeTileEntity(x, y, z); } @Override public int getLightValue(IBlockAccess world, int x, int y, int z) { - Block block = blocksList[world.getBlockId(x, y, z)]; - if(block != null && block.blockID != blockID) { + Block block = world.getBlock(x, y, z); + if(block != null && block != this) { return block.getLightValue(world, x, y, z); } int onVal = 15; @@ -87,27 +78,16 @@ public class BlockLightNode extends Block implements ITileEntityProvider { } @Override - public void onNeighborBlockChange(World world, int x, int y, int z, int par5) { + public void onNeighborBlockChange(World world, int x, int y, int z, Block par5) { TileLightNode te = (TileLightNode) world.getTileEntity(x, y, z); if(te != null) { te.onNeighbourChanged(); } } - protected void init() { - LanguageRegistry.addName(this, ModObject.blockLightNode.name); - GameRegistry.registerBlock(this, ModObject.blockLightNode.unlocalisedName); - GameRegistry.registerTileEntity(TileLightNode.class, ModObject.blockLightNode.unlocalisedName + "TileEntity"); - } - @Override - public void registerIcons(IIconRegister IIconRegister) { - blockIcon = IIconRegister.registerIcon("enderio:blockElectricLightFace"); - } - - @Override - public TileEntity createNewTileEntity(World world) { - return new TileLightNode(); + public void registerBlockIcons(IIconRegister iIconRegister) { + blockIcon = iIconRegister.registerIcon("enderio:blockElectricLightFace"); } } diff --git a/src/main/java/crazypants/enderio/machine/light/ElectricLightRenderer.java b/src/main/java/crazypants/enderio/machine/light/ElectricLightRenderer.java index 7fd539fc..ef7bd335 100644 --- a/src/main/java/crazypants/enderio/machine/light/ElectricLightRenderer.java +++ b/src/main/java/crazypants/enderio/machine/light/ElectricLightRenderer.java @@ -18,10 +18,11 @@ public class ElectricLightRenderer implements ISimpleBlockRenderingHandler { BoundingBox bb = new BoundingBox(0, 0, 0, 1, 0.2, 1); boolean doDraw = false; - if(!Tessellator.instance.isDrawing) { - doDraw = true; - Tessellator.instance.startDrawingQuads(); - } + //TODO:1.7 + // if(!Tessellator.instance.isDrawing) { + // doDraw = true; + // Tessellator.instance.startDrawingQuads(); + // } IIcon[] textures = new IIcon[6]; textures[0] = block.getBlockTextureFromSide(ForgeDirection.NORTH.ordinal()); textures[1] = block.getBlockTextureFromSide(ForgeDirection.SOUTH.ordinal()); @@ -47,26 +48,26 @@ public class ElectricLightRenderer implements ISimpleBlockRenderingHandler { RenderUtil.setTesselatorBrightness(world, x, y, z); IIcon[] textures = new IIcon[6]; - textures[0] = block.getBlockTexture(world, x, y, z, ForgeDirection.NORTH.ordinal()); - textures[1] = block.getBlockTexture(world, x, y, z, ForgeDirection.SOUTH.ordinal()); - textures[2] = block.getBlockTexture(world, x, y, z, ForgeDirection.UP.ordinal()); - textures[3] = block.getBlockTexture(world, x, y, z, ForgeDirection.DOWN.ordinal()); - textures[4] = block.getBlockTexture(world, x, y, z, ForgeDirection.WEST.ordinal()); - textures[5] = block.getBlockTexture(world, x, y, z, ForgeDirection.EAST.ordinal()); + textures[0] = block.getIcon(world, x, y, z, ForgeDirection.NORTH.ordinal()); + textures[1] = block.getIcon(world, x, y, z, ForgeDirection.SOUTH.ordinal()); + textures[2] = block.getIcon(world, x, y, z, ForgeDirection.UP.ordinal()); + textures[3] = block.getIcon(world, x, y, z, ForgeDirection.DOWN.ordinal()); + textures[4] = block.getIcon(world, x, y, z, ForgeDirection.WEST.ordinal()); + textures[5] = block.getIcon(world, x, y, z, ForgeDirection.EAST.ordinal()); CubeRenderer.render(bb, textures, null); return true; } - @Override - public boolean shouldRender3DInInventory() { - return true; - } - @Override public int getRenderId() { return BlockElectricLight.renderId; } + @Override + public boolean shouldRender3DInInventory(int modelId) { + return true; + } + } diff --git a/src/main/java/crazypants/enderio/machine/light/TileElectricLight.java b/src/main/java/crazypants/enderio/machine/light/TileElectricLight.java index 238892e9..1c8b27ee 100644 --- a/src/main/java/crazypants/enderio/machine/light/TileElectricLight.java +++ b/src/main/java/crazypants/enderio/machine/light/TileElectricLight.java @@ -5,7 +5,6 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.packet.Packet; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.World; @@ -13,8 +12,8 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.power.PowerHandler; import buildcraft.api.power.PowerHandler.PowerReceiver; import buildcraft.api.power.PowerHandler.Type; -import crazypants.enderio.ModObject; -import crazypants.enderio.PacketHandler; +import crazypants.enderio.EnderIO; +import crazypants.enderio.TileEntityEio; import crazypants.enderio.power.Capacitors; import crazypants.enderio.power.IInternalPowerReceptor; import crazypants.enderio.power.PowerHandlerUtil; @@ -22,7 +21,7 @@ import crazypants.util.BlockCoord; import crazypants.util.ForgeDirectionOffsets; import crazypants.vecmath.Vector3d; -public class TileElectricLight extends TileEntity implements IInternalPowerReceptor { +public class TileElectricLight extends TileEntityEio implements IInternalPowerReceptor { private ForgeDirection face = ForgeDirection.DOWN; @@ -44,7 +43,7 @@ public class TileElectricLight extends TileEntity implements IInternalPowerRecep powerHandler = PowerHandlerUtil.createHandler(Capacitors.BASIC_CAPACITOR.capacitor, this, Type.MACHINE); } - public void onNeighborBlockChange(int blockID) { + public void onNeighborBlockChange(Block blockID) { init = true; } @@ -53,7 +52,7 @@ public class TileElectricLight extends TileEntity implements IInternalPowerRecep } public void nodeRemoved(TileLightNode tileLightNode) { - if (!updatingLightNodes) { + if(!updatingLightNodes) { init = true; } } @@ -68,34 +67,34 @@ public class TileElectricLight extends TileEntity implements IInternalPowerRecep @Override public void updateEntity() { - if (worldObj.isRemote) { + if(worldObj.isRemote) { return; } boolean hasRedstone = hasRedstoneSignal(); - float stored = powerHandler.getEnergyStored(); + double stored = powerHandler.getEnergyStored(); powerHandler.update(); powerHandler.setEnergy(stored); - if (hasRedstone) { + if(hasRedstone) { powerHandler.setEnergy(Math.max(0, powerHandler.getEnergyStored() - MJ_USE_PER_TICK)); } boolean isActivated = hasPower() && hasRedstone; - if (init) { + if(init) { updateLightNodes(); } - if (isActivated != lastActive || init) { + if(isActivated != lastActive || init) { worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, isActivated ? 1 : 0, 2); for (TileLightNode ln : lightNodes) { - if (ln != null) { + if(ln != null) { worldObj.setBlockMetadataWithNotify(ln.xCoord, ln.yCoord, ln.zCoord, isActivated ? 1 : 0, 2); worldObj.markBlockForUpdate(ln.xCoord, ln.yCoord, ln.zCoord); worldObj.updateLightByType(EnumSkyBlock.Block, ln.xCoord, ln.yCoord, ln.zCoord); } } - worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord); + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); worldObj.updateLightByType(EnumSkyBlock.Block, xCoord, yCoord, zCoord); init = false; lastActive = isActivated; @@ -114,34 +113,34 @@ public class TileElectricLight extends TileEntity implements IInternalPowerRecep private void updateLightNodes() { updatingLightNodes = true; List before = new ArrayList(17); - if (lightNodes != null) { + if(lightNodes != null) { for (TileLightNode node : lightNodes) { before.add(new NodeEntry(node)); } } List after = new ArrayList(17); try { - if (lightNodeCoords != null) { + if(lightNodeCoords != null) { // just loaded lightNodes = new ArrayList(); for (int i = 0; i < lightNodeCoords.length; i += 3) { TileEntity te = worldObj.getTileEntity(lightNodeCoords[i], lightNodeCoords[i + 1], lightNodeCoords[i + 2]); - if (te instanceof TileLightNode) { + if(te instanceof TileLightNode) { lightNodes.add((TileLightNode) te); } } lightNodeCoords = null; - } else if (lightNodes == null) { // just created + } else if(lightNodes == null) { // just created lightNodes = new ArrayList(); } for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - if (dir != face && dir != face.getOpposite()) { // don't project behind - // us + if(dir != face && dir != face.getOpposite()) { // don't project behind + // us Vector3d offset = ForgeDirectionOffsets.forDirCopy(dir); addNodeInDirection(new Vector3d(offset), after); addNodeInDirection(offset.add(ForgeDirectionOffsets.forDirCopy(face.getOpposite())), after); @@ -151,10 +150,10 @@ public class TileElectricLight extends TileEntity implements IInternalPowerRecep addNodeInDirection(ForgeDirectionOffsets.forDirCopy(face.getOpposite()), after); Vector3d[] diags = new Vector3d[2]; - if (face.offsetX != 0) { + if(face.offsetX != 0) { diags[0] = ForgeDirectionOffsets.forDirCopy(ForgeDirection.UP); diags[1] = ForgeDirectionOffsets.forDirCopy(ForgeDirection.SOUTH); - } else if (face.offsetY != 0) { + } else if(face.offsetY != 0) { diags[0] = ForgeDirectionOffsets.forDirCopy(ForgeDirection.EAST); diags[1] = ForgeDirectionOffsets.forDirCopy(ForgeDirection.SOUTH); } else { @@ -164,14 +163,14 @@ public class TileElectricLight extends TileEntity implements IInternalPowerRecep addDiaganals(diags, new Vector3d(), after); addDiaganals(diags, ForgeDirectionOffsets.forDirCopy(face.getOpposite()), after); - if (!areEqual(before, after)) { + if(!areEqual(before, after)) { clearLightNodes(); for (NodeEntry entry : after) { - worldObj.setBlock(entry.coord.x, entry.coord.y, entry.coord.z, ModObject.blockLightNode.actualId); + worldObj.setBlock(entry.coord.x, entry.coord.y, entry.coord.z, EnderIO.blockLightNode); TileEntity te = worldObj.getTileEntity(entry.coord.x, entry.coord.y, entry.coord.z); - if (te instanceof TileLightNode) { + if(te instanceof TileLightNode) { TileLightNode ln = (TileLightNode) te; ln.parentX = xCoord; ln.parentY = yCoord; @@ -191,11 +190,11 @@ public class TileElectricLight extends TileEntity implements IInternalPowerRecep } private boolean areEqual(List before, List after) { - if (before.size() != after.size()) { + if(before.size() != after.size()) { return false; } for (NodeEntry entry : before) { - if (!after.contains(entry)) { + if(!after.contains(entry)) { return false; } } @@ -229,11 +228,11 @@ public class TileElectricLight extends TileEntity implements IInternalPowerRecep boolean isAir = isAir(offset); boolean isTransp = isTranparent(offset); - if (isAir || isTransp) { + if(isAir || isTransp) { offset.scale(2); - if (isAir(offset)) { + if(isAir(offset)) { addLightNode(offset, diagnal, result); - } else if (isAir) { + } else if(isAir) { offset.scale(0.5); addLightNode(offset, diagnal, result); } @@ -241,13 +240,13 @@ public class TileElectricLight extends TileEntity implements IInternalPowerRecep } private boolean isLightNode(Vector3d offset) { - return worldObj.getBlockId(xCoord + (int) offset.x, yCoord + (int) offset.y, zCoord + (int) offset.z) == ModObject.blockLightNode.actualId; + return worldObj.getBlock(xCoord + (int) offset.x, yCoord + (int) offset.y, zCoord + (int) offset.z) == EnderIO.blockLightNode; } private void clearLightNodes() { - if (lightNodes != null) { + if(lightNodes != null) { for (TileLightNode ln : lightNodes) { - if (worldObj.getBlockId(ln.xCoord, ln.yCoord, ln.zCoord) == ModObject.blockLightNode.actualId) { + if(worldObj.getBlock(ln.xCoord, ln.yCoord, ln.zCoord) == EnderIO.blockLightNode) { worldObj.setBlockToAir(ln.xCoord, ln.yCoord, ln.zCoord); } } @@ -261,9 +260,9 @@ public class TileElectricLight extends TileEntity implements IInternalPowerRecep int y = yCoord + (int) offset.y; int z = zCoord + (int) offset.z; - if (isLightNode(offset)) { + if(isLightNode(offset)) { TileLightNode te = (TileLightNode) worldObj.getTileEntity(x, y, z); - if (te.parentX != xCoord || te.parentY != yCoord || te.parentZ != zCoord) { + if(te.parentX != xCoord || te.parentY != yCoord || te.parentZ != zCoord) { // its somebody else's so leave it alone return; } @@ -271,21 +270,19 @@ public class TileElectricLight extends TileEntity implements IInternalPowerRecep result.add(new NodeEntry(new BlockCoord(x, y, z), isDiag)); } - private boolean isRailcraftException(int id) { - if (id > 0 && Block.blocksList[id] != null) { - // Pretty bad hack, by only feasable way I can think of to prevent our - // light nodes getting placed inside railcraft tanks. - String className = Block.blocksList[id].getClass().getName(); - if (className.equals("mods.railcraft.common.blocks.machine.BlockMachine")) { - return true; - } + private boolean isRailcraftException(Block id) { + + String className = id.getClass().getName(); + if(className.equals("mods.railcraft.common.blocks.machine.BlockMachine")) { + return true; } + return false; } private boolean isTranparent(Vector3d offset) { - int id = worldObj.getBlockId(xCoord + (int) offset.x, yCoord + (int) offset.y, zCoord + (int) offset.z); - if (isRailcraftException(id)) { + Block id = worldObj.getBlock(xCoord + (int) offset.x, yCoord + (int) offset.y, zCoord + (int) offset.z); + if(isRailcraftException(id)) { return false; } return worldObj.getBlockLightOpacity(xCoord + (int) offset.x, yCoord + (int) offset.y, zCoord + (int) offset.z) == 0; @@ -296,8 +293,8 @@ public class TileElectricLight extends TileEntity implements IInternalPowerRecep } @Override - public void readFromNBT(NBTTagCompound root) { - super.readFromNBT(root); + public void readCustomNBT(NBTTagCompound root) { + face = ForgeDirection.values()[root.getShort("face")]; float storedEnergy = root.getFloat("storedEnergy"); @@ -306,12 +303,12 @@ public class TileElectricLight extends TileEntity implements IInternalPowerRecep } @Override - public void writeToNBT(NBTTagCompound root) { - super.writeToNBT(root); - root.setShort("face", (short) face.ordinal()); - root.setFloat("storedEnergy", powerHandler.getEnergyStored()); + public void writeCustomNBT(NBTTagCompound root) { - if (lightNodes != null) { + root.setShort("face", (short) face.ordinal()); + root.setFloat("storedEnergy", (float) powerHandler.getEnergyStored()); + + if(lightNodes != null) { int[] lnLoc = new int[lightNodes.size() * 3]; int index = 0; for (TileLightNode ln : lightNodes) { @@ -331,11 +328,6 @@ public class TileElectricLight extends TileEntity implements IInternalPowerRecep return worldObj.getStrongestIndirectPower(xCoord, yCoord, zCoord) > 0; } - @Override - public Packet getDescriptionPacket() { - return PacketHandler.getPacket(this); - } - @Override public PowerReceiver getPowerReceiver(ForgeDirection side) { return powerHandler.getPowerReceiver(); @@ -411,24 +403,24 @@ public class TileElectricLight extends TileEntity implements IInternalPowerRecep @Override public boolean equals(Object obj) { - if (this == obj) { + if(this == obj) { return true; } - if (obj == null) { + if(obj == null) { return false; } - if (getClass() != obj.getClass()) { + if(getClass() != obj.getClass()) { return false; } NodeEntry other = (NodeEntry) obj; - if (coord == null) { - if (other.coord != null) { + if(coord == null) { + if(other.coord != null) { return false; } - } else if (!coord.equals(other.coord)) { + } else if(!coord.equals(other.coord)) { return false; } - if (isDiagnal != other.isDiagnal) { + if(isDiagnal != other.isDiagnal) { return false; } return true; diff --git a/src/main/java/crazypants/enderio/machine/light/TileLightNode.java b/src/main/java/crazypants/enderio/machine/light/TileLightNode.java index fd868484..da0703b0 100644 --- a/src/main/java/crazypants/enderio/machine/light/TileLightNode.java +++ b/src/main/java/crazypants/enderio/machine/light/TileLightNode.java @@ -2,9 +2,10 @@ package crazypants.enderio.machine.light; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import crazypants.enderio.ModObject; +import crazypants.enderio.EnderIO; +import crazypants.enderio.TileEntityEio; -public class TileLightNode extends TileEntity { +public class TileLightNode extends TileEntityEio { int parentX; int parentY; @@ -26,7 +27,7 @@ public class TileLightNode extends TileEntity { return; } if(worldObj.getWorldTime() % 42 == 0) { - if(worldObj.getBlockId(parentX, parentY, parentZ) != ModObject.blockElectricLight.actualId) { + if(worldObj.getBlock(parentX, parentY, parentZ) != EnderIO.blockElectricLight) { System.out.println("TileLightNode.updateEntity: "); worldObj.setBlockToAir(xCoord, yCoord, zCoord); } @@ -48,8 +49,7 @@ public class TileLightNode extends TileEntity { } @Override - public void readFromNBT(NBTTagCompound root) { - super.readFromNBT(root); + public void readCustomNBT(NBTTagCompound root) { parentX = root.getInteger("parentX"); parentY = root.getInteger("parentY"); parentZ = root.getInteger("parentZ"); @@ -57,8 +57,7 @@ public class TileLightNode extends TileEntity { } @Override - public void writeToNBT(NBTTagCompound root) { - super.writeToNBT(root); + public void writeCustomNBT(NBTTagCompound root) { root.setInteger("parentX", parentX); root.setInteger("parentY", parentY); root.setInteger("parentZ", parentZ); diff --git a/src/main/java/crazypants/enderio/machine/painter/PainterUtil.java b/src/main/java/crazypants/enderio/machine/painter/PainterUtil.java index 581fd6f5..76f2a989 100644 --- a/src/main/java/crazypants/enderio/machine/painter/PainterUtil.java +++ b/src/main/java/crazypants/enderio/machine/painter/PainterUtil.java @@ -1,10 +1,10 @@ package crazypants.enderio.machine.painter; -import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; +import cpw.mods.fml.common.registry.GameData; import crazypants.util.Lang; public final class PainterUtil { @@ -16,32 +16,20 @@ public final class PainterUtil { if(one == null || two == null) { return false; } - return PainterUtil.getSourceBlockId(one) == PainterUtil.getSourceBlockId(two) + return PainterUtil.getSourceBlock(one) == PainterUtil.getSourceBlock(two) && PainterUtil.getSourceBlockMetadata(one) == PainterUtil.getSourceBlockMetadata(two); } - public static Block getSourceBlock(ItemStack item) { + public static Item getSourceBlock(ItemStack item) { NBTTagCompound tag = item.getTagCompound(); if(tag != null) { - int blockId = tag.getInteger(BlockPainter.KEY_SOURCE_BLOCK_ID); - if(blockId >= 0 && blockId < Block.blocksList.length) { - return Block.blocksList[blockId]; - } + String blockId = tag.getString(BlockPainter.KEY_SOURCE_BLOCK_ID); + Item res = GameData.itemRegistry.get(blockId); + return res; } return null; } - public static int getSourceBlockId(ItemStack item) { - NBTTagCompound tag = item.getTagCompound(); - if(tag != null) { - int blockId = tag.getInteger(BlockPainter.KEY_SOURCE_BLOCK_ID); - if(blockId >= 0 && blockId < Block.blocksList.length) { - return blockId; - } - } - return -1; - } - public static int getSourceBlockMetadata(ItemStack item) { NBTTagCompound tag = item.getTagCompound(); if(tag != null) { @@ -52,25 +40,24 @@ public final class PainterUtil { public static String getTooltTipText(ItemStack item) { String sourceName = ""; - int sourceId = PainterUtil.getSourceBlockId(item); + Item sourceId = PainterUtil.getSourceBlock(item); int meta = PainterUtil.getSourceBlockMetadata(item); - if(sourceId > 0) { - Item i = Item.itemsList[sourceId]; - if(i != null) { - sourceName = i.getUnlocalizedName(new ItemStack(sourceId, 1, meta)); + if(sourceId != null) { + if(sourceId != null) { + sourceName = sourceId.getUnlocalizedName(new ItemStack(sourceId, 1, meta)); sourceName = StatCollector.translateToLocal(sourceName + ".name"); } } return Lang.localize("blockPainter.paintedWith") + " " + sourceName; } - public static void setSourceBlock(ItemStack item, int sourceId, int meta) { + public static void setSourceBlock(ItemStack item, String sourceId, int meta) { NBTTagCompound tag = item.getTagCompound(); if(tag == null) { tag = new NBTTagCompound(); item.setTagCompound(tag); } - tag.setInteger(BlockPainter.KEY_SOURCE_BLOCK_ID, sourceId); + tag.setString(BlockPainter.KEY_SOURCE_BLOCK_ID, sourceId); tag.setInteger(BlockPainter.KEY_SOURCE_BLOCK_META, meta); } diff --git a/src/main/java/crazypants/enderio/machine/painter/TileEntityCustomBlock.java b/src/main/java/crazypants/enderio/machine/painter/TileEntityCustomBlock.java index ebad1d83..25946e17 100644 --- a/src/main/java/crazypants/enderio/machine/painter/TileEntityCustomBlock.java +++ b/src/main/java/crazypants/enderio/machine/painter/TileEntityCustomBlock.java @@ -2,40 +2,39 @@ package crazypants.enderio.machine.painter; import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.packet.Packet; -import net.minecraft.tileentity.TileEntity; -import crazypants.enderio.PacketHandler; +import cpw.mods.fml.common.registry.GameData; +import crazypants.enderio.TileEntityEio; -public class TileEntityCustomBlock extends TileEntity { +public class TileEntityCustomBlock extends TileEntityEio { private static final String KEY_SOURCE_BLOCK_ID = "sourceBlockId"; private static final String KEY_SOURCE_BLOCK_META = "sourceBlockMeta"; - private int sourceBlockId; + private String sourceBlockId; private int sourceBlockMetadata; public TileEntityCustomBlock() { - this.sourceBlockId = -1; + this.sourceBlockId = null; } @Override - public void readFromNBT(NBTTagCompound nbtRoot) { - super.readFromNBT(nbtRoot); - sourceBlockId = nbtRoot.getInteger(KEY_SOURCE_BLOCK_ID); + public void readCustomNBT(NBTTagCompound nbtRoot) { + sourceBlockId = nbtRoot.getString(KEY_SOURCE_BLOCK_ID); sourceBlockMetadata = nbtRoot.getInteger(KEY_SOURCE_BLOCK_META); } @Override - public void writeToNBT(NBTTagCompound nbtRoot) { - super.writeToNBT(nbtRoot); - nbtRoot.setInteger(KEY_SOURCE_BLOCK_ID, sourceBlockId); + public void writeCustomNBT(NBTTagCompound nbtRoot) { + if(sourceBlockId != null && sourceBlockId.trim().length() > 0) { + nbtRoot.setString(KEY_SOURCE_BLOCK_ID, sourceBlockId); + } nbtRoot.setInteger(KEY_SOURCE_BLOCK_META, sourceBlockMetadata); } - public int getSourceBlockId() { + public String getSourceBlockId() { return sourceBlockId; } - public void setSourceBlockId(int sourceBlockId) { + public void setSourceBlockId(String sourceBlockId) { this.sourceBlockId = sourceBlockId; } @@ -48,15 +47,10 @@ public class TileEntityCustomBlock extends TileEntity { } public Block getSourceBlock() { - if(sourceBlockId <= 0) { + if(sourceBlockId == null) { return null; } - return Block.blocksList[sourceBlockId]; - } - - @Override - public Packet getDescriptionPacket() { - return PacketHandler.getPacket(this); + return GameData.blockRegistry.get(sourceBlockId); } @Override diff --git a/src/main/java/crazypants/enderio/machine/recipe/RecipeConfigParser.java b/src/main/java/crazypants/enderio/machine/recipe/RecipeConfigParser.java index 32281f24..2629f1e1 100644 --- a/src/main/java/crazypants/enderio/machine/recipe/RecipeConfigParser.java +++ b/src/main/java/crazypants/enderio/machine/recipe/RecipeConfigParser.java @@ -320,6 +320,8 @@ public class RecipeConfigParser extends DefaultHandler { } public static RecipeInput getItemStack(Attributes attributes) { + + int stackSize = getIntValue(AT_NUMBER, attributes, 1); String oreDict = getStringValue(AT_ORE_DICT, attributes, null); if(oreDict != null) { ArrayList ores = OreDictionary.getOres(oreDict); @@ -328,48 +330,47 @@ public class RecipeConfigParser extends DefaultHandler { return null; } ItemStack stack = ores.get(0).copy(); - stack.stackSize = getIntValue(AT_NUMBER, attributes, 1); - boolean useMeta = true; - if(stack.getItemDamage() == OreDictionary.WILDCARD_VALUE) { - useMeta = false; - } + stack.stackSize = stackSize; return new OreDictionaryRecipeInput(stack, OreDictionary.getOreID(oreDict)); } - int itemID = getIntValue(AT_ITEM_ID, attributes, -1); - if(itemID <= 0) { - - String modId = getStringValue(AT_MOD_ID, attributes, null); - String name = getStringValue(AT_ITEM_NAME, attributes, null); - - if(modId != null && name != null) { - - Item i = GameRegistry.findItem(modId, name); - if(i != null) { - itemID = i.itemID; - } else { - Block b = GameRegistry.findBlock(modId, name); - if(b != null) { - itemID = b.blockID; - } - } - } - } - - if(itemID <= 0) { - Log.debug("Could not create an item stack from the attributes " + toString(attributes)); - return null; - } - boolean useMeta = true; String metaString = getStringValue(AT_ITEM_META, attributes, "0"); if("*".equals(metaString)) { useMeta = false; } int itemMeta = getIntValue(AT_ITEM_META, attributes, 0); - int stackSize = getIntValue(AT_NUMBER, attributes, 1); - return new RecipeInput(new ItemStack(itemID, stackSize, itemMeta), useMeta); + int itemID = getIntValue(AT_ITEM_ID, attributes, -1); + if(itemID > 0) { + + //TODO:1.7 do I want to support ID still? + //return new RecipeInput(new ItemStack(itemID, stackSize, itemMeta), useMeta); + return null; + } + ItemStack res = null; + + String modId = getStringValue(AT_MOD_ID, attributes, null); + String name = getStringValue(AT_ITEM_NAME, attributes, null); + + if(modId != null && name != null) { + + Item i = GameRegistry.findItem(modId, name); + if(i != null) { + res = new ItemStack(i, 1, useMeta ? itemMeta : 0); + } else { + Block b = GameRegistry.findBlock(modId, name); + if(b != null) { + res = new ItemStack(b, 1, useMeta ? itemMeta : 0); + } + } + } + + if(res == null) { + Log.debug("Could not create an item stack from the attributes " + toString(attributes)); + return null; + } + return new RecipeInput(res, useMeta); } public static boolean getBooleanValue(String qName, Attributes attributes, boolean def) { diff --git a/src/main/java/crazypants/enderio/machine/recipe/RecipeInput.java b/src/main/java/crazypants/enderio/machine/recipe/RecipeInput.java index 71992717..55261915 100644 --- a/src/main/java/crazypants/enderio/machine/recipe/RecipeInput.java +++ b/src/main/java/crazypants/enderio/machine/recipe/RecipeInput.java @@ -22,9 +22,9 @@ public class RecipeInput { public boolean isInput(ItemStack test) { if(useMeta) { - return test.itemID == input.itemID && test.getItemDamage() == input.getItemDamage(); + return test.getItem() == input.getItem() && test.getItemDamage() == input.getItemDamage(); } - return test.itemID == input.itemID; + return test.getItem() == input.getItem(); } public ItemStack[] getEquivelentInputs() { diff --git a/src/main/java/crazypants/enderio/machine/reservoir/BlockReservoir.java b/src/main/java/crazypants/enderio/machine/reservoir/BlockReservoir.java index d6caa5e1..bd7a3db5 100644 --- a/src/main/java/crazypants/enderio/machine/reservoir/BlockReservoir.java +++ b/src/main/java/crazypants/enderio/machine/reservoir/BlockReservoir.java @@ -5,6 +5,7 @@ import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; @@ -13,13 +14,13 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; -import crazypants.enderio.conduit.ConduitUtil; import crazypants.enderio.machine.reservoir.TileReservoir.Pos; import crazypants.util.BlockCoord; import crazypants.util.Util; @@ -55,13 +56,18 @@ public class BlockReservoir extends BlockContainer { IIcon switchIcon; private BlockReservoir() { - super(ModObject.blockReservoir.id, Material.rock); + super(Material.rock); setHardness(0.5F); - setStepSound(Block.soundStoneFootstep); - setUnlocalizedName("enderio." + ModObject.blockReservoir.name()); + setStepSound(Block.soundTypeStone); + setBlockName(ModObject.blockReservoir.unlocalisedName); setCreativeTab(EnderIOTab.tabEnderIO); } + @Override + public TileEntity createNewTileEntity(World var1, int var2) { + return new TileReservoir(); + } + private void init() { GameRegistry.registerBlock(this, ModObject.blockReservoir.unlocalisedName); GameRegistry.registerTileEntity(TileReservoir.class, ModObject.blockReservoir.unlocalisedName + "TileEntity"); @@ -76,6 +82,13 @@ public class BlockReservoir extends BlockContainer { TileReservoir tank = (TileReservoir) world.getTileEntity(x, y, z); FluidStack liquid = FluidContainerRegistry.getFluidForFilledItem(current); + if(liquid == null) { + if(current.getItem() == Items.water_bucket) { + liquid = new FluidStack(FluidRegistry.WATER, 1000); + } else if(current.getItem() == Items.lava_bucket) { + liquid = new FluidStack(FluidRegistry.LAVA, 1000); + } + } if(liquid != null) { // Handle filled containers @@ -98,9 +111,9 @@ public class BlockReservoir extends BlockContainer { if(liquid != null) { if(!entityPlayer.capabilities.isCreativeMode) { if(current.stackSize > 1) { - if(!entityPlayer.inventory.addItemStackToInventory(filled)) + if(!entityPlayer.inventory.addItemStackToInventory(filled)) { return false; - else { + } else { entityPlayer.inventory.setInventorySlotContents(entityPlayer.inventory.currentItem, Util.consumeItem(current)); } } else { @@ -111,13 +124,15 @@ public class BlockReservoir extends BlockContainer { tank.drain(ForgeDirection.UNKNOWN, liquid.amount, true); return true; - } else if(ConduitUtil.isToolEquipped(entityPlayer) && tank.isMultiblock()) { - tank.setAutoEject(!tank.isAutoEject()); - for (BlockCoord bc : tank.multiblock) { - world.markBlockForUpdate(bc.x, bc.y, bc.z); - } - } + //TODO:1.7 + // else if(ConduitUtil.isToolEquipped(entityPlayer) && tank.isMultiblock()) { + // tank.setAutoEject(!tank.isAutoEject()); + // for (BlockCoord bc : tank.multiblock) { + // world.markBlockForUpdate(bc.x, bc.y, bc.z); + // } + // + // } } } @@ -163,11 +178,6 @@ public class BlockReservoir extends BlockContainer { return false; } - @Override - public TileEntity createNewTileEntity(World world) { - return null; - } - @Override public TileEntity createTileEntity(World world, int metadata) { return new TileReservoir(); @@ -184,7 +194,7 @@ public class BlockReservoir extends BlockContainer { } @Override - public void onNeighborBlockChange(World world, int x, int y, int z, int blockId) { + public void onNeighborBlockChange(World world, int x, int y, int z, Block blockId) { if(world.isRemote) { return; } @@ -193,7 +203,7 @@ public class BlockReservoir extends BlockContainer { } @Override - public void registerIcons(IIconRegister IIconRegister) { + public void registerBlockIcons(IIconRegister IIconRegister) { blockIcon = IIconRegister.registerIcon("enderio:reservoir"); for (MbFace face : MbFace.values()) { mbIcons[face.ordinal()] = IIconRegister.registerIcon("enderio:" + face.iconName); @@ -216,7 +226,7 @@ public class BlockReservoir extends BlockContainer { } @Override - public IIcon getBlockTexture(IBlockAccess world, int x, int y, int z, int blockSide) { + public IIcon getIcon(IBlockAccess world, int x, int y, int z, int blockSide) { // used to render the block in the world TileEntity te = world.getTileEntity(x, y, z); @@ -236,7 +246,7 @@ public class BlockReservoir extends BlockContainer { boolean isRight; if(tr.isVertical()) { // to to flip right and left for back faces of // vertical multiblocks - isRight = (pos.isRight && tr.front != side.getOpposite()) || (!pos.isRight && tr.front == side.getOpposite()); + isRight = !pos.isRight; } else { isRight = pos.isRight; } @@ -247,7 +257,7 @@ public class BlockReservoir extends BlockContainer { } } - if(tr.up == side || tr.up == side.getOpposite()) { // up or down face + if(tr.up == side || tr.up == side.getOpposite()) { // up or down face if(tr.isVertical()) { if(tr.right.offsetX != 0) { return pos.isRight ? mbIcons[MbFace.L.ordinal()] : mbIcons[MbFace.R.ordinal()]; @@ -266,7 +276,7 @@ public class BlockReservoir extends BlockContainer { if(tr.isVertical()) { return pos.isTop ? mbIcons[MbFace.T.ordinal()] : mbIcons[MbFace.B.ordinal()]; } else { - if(tr.right != side) { + if(tr.right == side || tr.right.getOpposite() == side) { return pos.isTop ? mbIcons[MbFace.L.ordinal()] : mbIcons[MbFace.R.ordinal()]; } else { return pos.isTop ? mbIcons[MbFace.R.ordinal()] : mbIcons[MbFace.L.ordinal()]; diff --git a/src/main/java/crazypants/enderio/machine/reservoir/ReservoirRenderer.java b/src/main/java/crazypants/enderio/machine/reservoir/ReservoirRenderer.java index 4dc54544..2911986b 100644 --- a/src/main/java/crazypants/enderio/machine/reservoir/ReservoirRenderer.java +++ b/src/main/java/crazypants/enderio/machine/reservoir/ReservoirRenderer.java @@ -36,7 +36,7 @@ public class ReservoirRenderer extends TileEntitySpecialRenderer { public void renderTileEntityAt(TileEntity tileentity, double x, double y, double z, float f) { TileReservoir res = (TileReservoir) tileentity; - if(res.haveRendered(tileentity.worldObj.getTotalWorldTime(), f)) { + if(res.haveRendered(tileentity.getWorldObj().getTotalWorldTime(), f)) { return; } @@ -45,7 +45,7 @@ public class ReservoirRenderer extends TileEntitySpecialRenderer { return; } - float val = RenderUtil.claculateTotalBrightnessForLocation(tileentity.worldObj, tileentity.xCoord, tileentity.yCoord, tileentity.zCoord); + float val = RenderUtil.claculateTotalBrightnessForLocation(tileentity.getWorldObj(), tileentity.xCoord, tileentity.yCoord, tileentity.zCoord); Minecraft.getMinecraft().entityRenderer.disableLightmap(0); GL11.glPushMatrix(); diff --git a/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java b/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java index a45148d0..84b8433d 100644 --- a/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java +++ b/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java @@ -1,16 +1,11 @@ package crazypants.enderio.machine.reservoir; -import static net.minecraftforge.common.ForgeDirection.EAST; -import static net.minecraftforge.common.ForgeDirection.NORTH; -import static net.minecraftforge.common.ForgeDirection.UNKNOWN; -import static net.minecraftforge.common.ForgeDirection.UP; -import static net.minecraftforge.common.ForgeDirection.WEST; import static net.minecraftforge.fluids.FluidContainerRegistry.BUCKET_VOLUME; import java.util.ArrayList; +import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.packet.Packet; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; @@ -18,13 +13,13 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; -import crazypants.enderio.ModObject; -import crazypants.enderio.PacketHandler; +import crazypants.enderio.EnderIO; +import crazypants.enderio.TileEntityEio; import crazypants.render.BoundingBox; import crazypants.util.BlockCoord; import crazypants.vecmath.Vector3f; -public class TileReservoir extends TileEntity implements IFluidHandler { +public class TileReservoir extends TileEntityEio implements IFluidHandler { enum Pos { TL(true, false), @@ -47,9 +42,9 @@ public class TileReservoir extends TileEntity implements IFluidHandler { BlockCoord[] multiblock = null; // Orientation of multibock - ForgeDirection front = UNKNOWN; - ForgeDirection up = UNKNOWN; - ForgeDirection right = UNKNOWN; + ForgeDirection front = ForgeDirection.UNKNOWN; + ForgeDirection up = ForgeDirection.UNKNOWN; + ForgeDirection right = ForgeDirection.UNKNOWN; // Position within multiblock Pos pos = Pos.UNKNOWN; @@ -161,11 +156,6 @@ public class TileReservoir extends TileEntity implements IFluidHandler { return new FluidTankInfo[] { tank.getInfo() }; } - @Override - public Packet getDescriptionPacket() { - return PacketHandler.getPacket(this); - } - public void setAutoEject(boolean autoEject) { TileReservoir c = getController(); if(c != null) { @@ -231,8 +221,8 @@ public class TileReservoir extends TileEntity implements IFluidHandler { } @Override - public void readFromNBT(NBTTagCompound nbtRoot) { - super.readFromNBT(nbtRoot); + public void readCustomNBT(NBTTagCompound nbtRoot) { + front = ForgeDirection.getOrientation(nbtRoot.getShort("front")); up = ForgeDirection.getOrientation(nbtRoot.getShort("up")); right = ForgeDirection.getOrientation(nbtRoot.getShort("right")); @@ -281,8 +271,8 @@ public class TileReservoir extends TileEntity implements IFluidHandler { } @Override - public void writeToNBT(NBTTagCompound nbtRoot) { - super.writeToNBT(nbtRoot); + public void writeCustomNBT(NBTTagCompound nbtRoot) { + nbtRoot.setShort("front", (short) front.ordinal()); nbtRoot.setShort("up", (short) up.ordinal()); nbtRoot.setShort("right", (short) right.ordinal()); @@ -315,8 +305,8 @@ public class TileReservoir extends TileEntity implements IFluidHandler { return res; } - public boolean onNeighborBlockChange(int blockId) { - if(blockId == ModObject.blockReservoir.actualId) { + public boolean onNeighborBlockChange(Block blockId) { + if(blockId == EnderIO.blockReservoir) { if(!isCurrentMultiblockValid()) { // if its not, try and form a new one @@ -337,7 +327,7 @@ public class TileReservoir extends TileEntity implements IFluidHandler { } boolean isVertical() { - return up == UP; + return up == ForgeDirection.UP; } boolean isMaster() { @@ -450,9 +440,9 @@ public class TileReservoir extends TileEntity implements IFluidHandler { private void updatePosition() { if(multiblock == null) { - front = UNKNOWN; - up = UNKNOWN; - right = UNKNOWN; + front = ForgeDirection.UNKNOWN; + up = ForgeDirection.UNKNOWN; + right = ForgeDirection.UNKNOWN; return; } @@ -472,12 +462,12 @@ public class TileReservoir extends TileEntity implements IFluidHandler { break; } } - front = isWestEast ? NORTH : EAST; - right = isWestEast ? WEST : NORTH; + front = isWestEast ? ForgeDirection.NORTH : ForgeDirection.EAST; + right = isWestEast ? ForgeDirection.WEST : ForgeDirection.NORTH; } else { - front = UP; - right = EAST; - up = NORTH; + front = ForgeDirection.UP; + right = ForgeDirection.EAST; + up = ForgeDirection.NORTH; } boolean isRight = false; diff --git a/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java b/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java index 09b7aa4b..798fdd82 100644 --- a/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java +++ b/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java @@ -3,8 +3,6 @@ package crazypants.enderio.machine.solar; import java.util.List; import net.minecraft.block.Block; -import net.minecraft.block.ITileEntityProvider; -import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -14,14 +12,11 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.tools.IToolWrench; -import cpw.mods.fml.common.registry.GameRegistry; import crazypants.enderio.Config; -import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; -import crazypants.enderio.conduit.ConduitUtil; +import crazypants.enderio.enderface.BlockEio; -public class BlockSolarPanel extends Block implements ITileEntityProvider { +public class BlockSolarPanel extends BlockEio { public static BlockSolarPanel create() { BlockSolarPanel result = new BlockSolarPanel(); @@ -34,23 +29,13 @@ public class BlockSolarPanel extends Block implements ITileEntityProvider { IIcon sideIcon; private BlockSolarPanel() { - super(ModObject.blockSolarPanel.id, Material.ground); - setHardness(0.5F); - setStepSound(Block.soundStoneFootstep); - setUnlocalizedName("enderio." + ModObject.blockSolarPanel.name()); - if(Config.photovoltaicCellEnabled) { - setCreativeTab(EnderIOTab.tabEnderIO); - } else { + super(ModObject.blockSolarPanel.unlocalisedName, TileEntitySolarPanel.class); + if(!Config.photovoltaicCellEnabled) { setCreativeTab(null); } setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, BLOCK_HEIGHT, 1.0F); } - private void init() { - GameRegistry.registerBlock(this, ModObject.blockSolarPanel.unlocalisedName); - GameRegistry.registerTileEntity(TileEntitySolarPanel.class, ModObject.blockSolarPanel.unlocalisedName + "TileEntity"); - } - @Override public boolean renderAsNormalBlock() { return false; @@ -61,28 +46,24 @@ public class BlockSolarPanel extends Block implements ITileEntityProvider { return false; } - @Override - public TileEntity createNewTileEntity(World world) { - return new TileEntitySolarPanel(); - } - @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int par6, float par7, float par8, float par9) { - if(ConduitUtil.isToolEquipped(entityPlayer) && entityPlayer.isSneaking()) { - if(entityPlayer.getCurrentEquippedItem().getItem() instanceof IToolWrench) { - IToolWrench wrench = (IToolWrench) entityPlayer.getCurrentEquippedItem().getItem(); - if(wrench.canWrench(entityPlayer, x, y, z)) { - removeBlockByPlayer(world, entityPlayer, x, y, z); - if(!world.isRemote && !entityPlayer.capabilities.isCreativeMode) { - dropBlockAsItem(world, x, y, z, 0, 0); - } - if(entityPlayer.getCurrentEquippedItem().getItem() instanceof IToolWrench) { - ((IToolWrench) entityPlayer.getCurrentEquippedItem().getItem()).wrenchUsed(entityPlayer, x, y, z); - } - return true; - } - } - } + //TODO:1.7 + // if(ConduitUtil.isToolEquipped(entityPlayer) && entityPlayer.isSneaking()) { + // if(entityPlayer.getCurrentEquippedItem().getItem() instanceof IToolWrench) { + // IToolWrench wrench = (IToolWrench) entityPlayer.getCurrentEquippedItem().getItem(); + // if(wrench.canWrench(entityPlayer, x, y, z)) { + // removedByPlayer(world, entityPlayer, x, y, z); + // if(!world.isRemote && !entityPlayer.capabilities.isCreativeMode) { + // dropBlockAsItem(world, x, y, z, 0, 0); + // } + // if(entityPlayer.getCurrentEquippedItem().getItem() instanceof IToolWrench) { + // ((IToolWrench) entityPlayer.getCurrentEquippedItem().getItem()).wrenchUsed(entityPlayer, x, y, z); + // } + // return true; + // } + // } + // } return false; } @@ -95,7 +76,7 @@ public class BlockSolarPanel extends Block implements ITileEntityProvider { } @Override - public void onNeighborBlockChange(World world, int x, int y, int z, int par5) { + public void onNeighborBlockChange(World world, int x, int y, int z, Block par5) { TileEntity te = world.getTileEntity(x, y, z); if(te instanceof TileEntitySolarPanel) { ((TileEntitySolarPanel) te).onNeighborBlockChange(); @@ -103,7 +84,7 @@ public class BlockSolarPanel extends Block implements ITileEntityProvider { } @Override - public void registerIcons(IIconRegister IIconRegister) { + public void registerBlockIcons(IIconRegister IIconRegister) { blockIcon = IIconRegister.registerIcon("enderio:solarPanelTop"); sideIcon = IIconRegister.registerIcon("enderio:solarPanelSide"); } diff --git a/src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java b/src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java index c3b1891b..1869a560 100644 --- a/src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java +++ b/src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java @@ -146,11 +146,11 @@ public class TileEntitySolarPanel extends TileEntity implements IInternalPowerRe } // Mandatory power handler update - float stored = powerHandler.getEnergyStored(); + double stored = powerHandler.getEnergyStored(); powerHandler.update(); powerHandler.setEnergy(stored); - float canTransmit = Math.min(powerHandler.getEnergyStored(), capacitor.getMaxEnergyExtracted()); + double canTransmit = Math.min(powerHandler.getEnergyStored(), capacitor.getMaxEnergyExtracted()); float transmitted = 0; checkReceptors(); @@ -166,7 +166,7 @@ public class TileEntitySolarPanel extends TileEntity implements IInternalPowerRe Receptor receptor = receptorIterator.next(); IPowerInterface pp = receptor.receptor; if(pp != null && pp.getMinEnergyReceived(receptor.fromDir.getOpposite()) <= canTransmit) { - float used = pp.recieveEnergy(receptor.fromDir.getOpposite(), canTransmit); + double used = pp.recieveEnergy(receptor.fromDir.getOpposite(), (float) canTransmit); transmitted += used; canTransmit -= used; } diff --git a/src/main/java/crazypants/enderio/material/BlockFusedQuartz.java b/src/main/java/crazypants/enderio/material/BlockFusedQuartz.java index ff336a89..0fc5bf23 100644 --- a/src/main/java/crazypants/enderio/material/BlockFusedQuartz.java +++ b/src/main/java/crazypants/enderio/material/BlockFusedQuartz.java @@ -6,6 +6,7 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.item.EntityItem; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -14,13 +15,13 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; import crazypants.enderio.enderface.BlockEio; -import crazypants.util.Lang; +import crazypants.enderio.machine.painter.PainterUtil; +import crazypants.enderio.machine.painter.TileEntityCustomBlock; public class BlockFusedQuartz extends BlockEio { @@ -56,21 +57,19 @@ public class BlockFusedQuartz extends BlockEio { IIcon[] frameIcons; private BlockFusedQuartz() { - //TODO:1.7 no custom block class - //super(ModObject.blockFusedQuartz.unlocalisedName, TileEntityCustomBlock.class, Material.glass); - super(ModObject.blockFusedQuartz.unlocalisedName, null, Material.glass); + super(ModObject.blockFusedQuartz.unlocalisedName, TileEntityCustomBlock.class, Material.glass); setStepSound(Block.soundTypeGlass); } @Override protected void init() { super.init(); - - for (Type subtype : Type.values()) { - String unlocalisedName = "blockFusedQuartz." + subtype.unlocalisedName; - LanguageRegistry.instance().addStringLocalization(unlocalisedName, Lang.localize(unlocalisedName)); - - } + //TODO:1.7 + // for (Type subtype : Type.values()) { + // String unlocalisedName = "blockFusedQuartz." + subtype.unlocalisedName; + // LanguageRegistry.instance().addStringLocalization(unlocalisedName, Lang.localize(unlocalisedName)); + // + // } } @Override @@ -175,34 +174,32 @@ public class BlockFusedQuartz extends BlockEio { if(!world.isRemote && world.getGameRules().getGameRuleBooleanValue("doTileDrops")) { TileEntity te = world.getTileEntity(x, y, z); - //TODO:1.7 - // if(te instanceof TileEntityCustomBlock) { - // TileEntityCustomBlock tef = (TileEntityCustomBlock) te; - // - // ItemStack itemStack = createItemStackForSourceBlock(world.getBlockMetadata(x, y, z), tef.getSourceBlockId(), tef.getSourceBlockMetadata()); - // if(itemStack != null) { - // float f = 0.7F; - // double d0 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - // double d1 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - // double d2 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - // EntityItem entityitem = new EntityItem(world, x + d0, y + d1, z + d2, itemStack); - // entityitem.delayBeforeCanPickup = 10; - // world.spawnEntityInWorld(entityitem); - // } - // } + if(te instanceof TileEntityCustomBlock) { + TileEntityCustomBlock tef = (TileEntityCustomBlock) te; + + ItemStack itemStack = createItemStackForSourceBlock(world.getBlockMetadata(x, y, z), tef.getSourceBlockId(), tef.getSourceBlockMetadata()); + if(itemStack != null) { + float f = 0.7F; + double d0 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; + double d1 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; + double d2 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; + EntityItem entityitem = new EntityItem(world, x + d0, y + d1, z + d2, itemStack); + entityitem.delayBeforeCanPickup = 10; + world.spawnEntityInWorld(entityitem); + } + } } super.breakBlock(world, x, y, z, par5, par6); } - private ItemStack createItemStackForSourceBlock(int quartzBlockMeta, int sourceBlockId, int sourceBlockMetadata) { - if(sourceBlockId <= 0) { + private ItemStack createItemStackForSourceBlock(int quartzBlockMeta, String sourceBlockId, int sourceBlockMetadata) { + if(sourceBlockId == null) { return null; } ItemStack result = new ItemStack(EnderIO.instance.itemFusedQuartzFrame, 1, quartzBlockMeta); - //TODO:1.7 - //PainterUtil.setSourceBlock(result, sourceBlockId, sourceBlockMetadata); + PainterUtil.setSourceBlock(result, sourceBlockId, sourceBlockMetadata); return result; }