From 91370e20e7a92a5e48f5101f3e4e7a4cb3f7bd7b Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Tue, 2 Dec 2014 15:32:16 +0800 Subject: [PATCH 01/12] Stubs in place --- resources/assets/enderio/lang/en_US.lang | 8 + .../blocks/capacitorBankCreativeBorder.png | Bin 0 -> 971 bytes .../blocks/capacitorBankVibrantBorder.png | Bin 0 -> 1393 bytes .../java/crazypants/enderio/ClientProxy.java | 9 + src/main/java/crazypants/enderio/EnderIO.java | 3 + .../java/crazypants/enderio/GuiHandler.java | 2 + .../java/crazypants/enderio/ModObject.java | 3 +- .../enderio/machine/capbank/BlockCapBank.java | 437 ++++++++++++++++++ .../machine/capbank/BlockItemCapBank.java | 93 ++++ .../machine/capbank/CapBankNetwork.java | 86 ++++ .../machine/capbank/CapBankRenderer.java | 104 +++++ .../enderio/machine/capbank/CapBankType.java | 120 +++++ .../machine/capbank/ContainerCapBank.java | 12 + .../enderio/machine/capbank/GuiCapBank.java | 12 + .../machine/capbank/NetworkManager.java | 65 +++ .../enderio/machine/capbank/TileCapBank.java | 334 +++++++++++++ 16 files changed, 1287 insertions(+), 1 deletion(-) create mode 100644 resources/assets/enderio/textures/blocks/capacitorBankCreativeBorder.png create mode 100644 resources/assets/enderio/textures/blocks/capacitorBankVibrantBorder.png create mode 100644 src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java create mode 100644 src/main/java/crazypants/enderio/machine/capbank/BlockItemCapBank.java create mode 100644 src/main/java/crazypants/enderio/machine/capbank/CapBankNetwork.java create mode 100644 src/main/java/crazypants/enderio/machine/capbank/CapBankRenderer.java create mode 100644 src/main/java/crazypants/enderio/machine/capbank/CapBankType.java create mode 100644 src/main/java/crazypants/enderio/machine/capbank/ContainerCapBank.java create mode 100644 src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java create mode 100644 src/main/java/crazypants/enderio/machine/capbank/NetworkManager.java create mode 100644 src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index c15ced79..11d005ec 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -259,6 +259,14 @@ tile.blockCapacitorBank.tooltip.detailed.line1=Multi-block energy storage. tile.blockCapacitorBank.tooltip.detailed.line2=Can charge RF powered items. tile.blockCapacitorBank.tooltipPrefix=Contains +tile.blockCapBank.creative.name=Creative Capacitor Bank +tile.blockCapBank.basic.name=Capacitor Bank +tile.blockCapBank.vibrant.name=Vibrant Capacitor Bank +tile.blockCapBank.tooltip.detailed.line1=Multi-block energy storage. +tile.blockCapBank.tooltip.detailed.line2=Can charge RF powered items. +tile.blockCapBank.tooltipPrefix=Contains + + enderio.capbank.maxIO=Max I/O enderio.capbank.maxIn=Max Input enderio.capbank.maxOut=Max Output diff --git a/resources/assets/enderio/textures/blocks/capacitorBankCreativeBorder.png b/resources/assets/enderio/textures/blocks/capacitorBankCreativeBorder.png new file mode 100644 index 0000000000000000000000000000000000000000..1ade6a6faa8b8173a6fbcfceff17d92cede47e2c GIT binary patch literal 971 zcmV;+12p`JP)N2bPDNB8 zb~7$DE-^4L^m3s900T!!L_t(YOO@8^QfoI5gi*i$1DZ=gLJBy6;%16KpdchmYB7jy zA5P`_VedT}b&sz0YQ0_`92^`S9UUJZ|K9myB9Y%dkQ3x@GunD9&Hep-;wxX?shpmk zo}Zup`IR3X@w2lt35fB@$w|D6#DiDWkR`r~`sL;2&CSjI{r$tk!(S6#1@G?eZf|cT zTwh;bU0q4uiKgILSsBX8m%5_<`1ttu#M9H0NZD*Qn>fX6CPA%1gpIn1uZ)G8D6Qw` z=hxTQx3@Q+FE1}%%ch*bsbGx6`^HSFX~v; zZrV0<40I{=z(A{sX$IM*7QOoHln#k#l91#@`C(~bKiRhWr{_-Tka!tv&rgWKn4+9y zcYw1tWIDz)&Qd>32}T_${~H4p3G=BcG=YrjuG*QO+2i8)N7p?P%ndcY5hndhIr_;>x$G z+LH83^%z7Nt@4kHfX){KPqq+)EUfI3#*myyd{KMYVNfSoG#NU~>ho4X;#GTe5or_P z`O6fQfo2u?j6pnxYG;<7MPb}TQB~S9p9Y??g=+6hqLPUUnT;;n`b(n~^eSu)Rk*nDxdi0ziSi42Fzv1TObInNh47>Mg^Tr4t0mD t8F-3^2FRF6pCUPszZ25bqP||Q{{!i_DM(GXu>$}A002ovPDHLkV1m&l#*zR4 literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/capacitorBankVibrantBorder.png b/resources/assets/enderio/textures/blocks/capacitorBankVibrantBorder.png new file mode 100644 index 0000000000000000000000000000000000000000..a57241ab56ba9c01699844d06e96c9ecd1925570 GIT binary patch literal 1393 zcmV-%1&;cOP)N2bPDNB8 zb~7$DE-^4L^m3s900iwxL_t(YOMR9JZ{kQ0h53h>kdr_lkdSlsKa4U;ln4X}5Jol# zgSeGrf8u^s)omMgXQd~Ow)?%R*HvZbel-q$w+>(0`Pa_Td++$Ychcym;4gUV9)s8J z5%(BgI(b1mgN`t`tL;3T&&?l@=lFVU=V56MPFulwCoFWr3y(s32+mn=24~H|Sz~b8 z=!27Yubn^xva6^3ed~%0&dzvdrVe0tccRQ#?_%J1t_Ul2C~BX za9T02f(&s(p2J*B7*4O?nr?1q+xyway?k!(_?yZsuSqB*p}8m}AV1B!3N&vCNRp1r zSPFR#9qcAXxaJ@Ci_Zrz|9C)Vy1k1xx8yVyjT_TY-^4nBGxJ(fU)@YrmUo>MG}^&A z{?t?gpj8KF!~JCpUvG4yP4w!680=L8<#MU zJ&`SMy5WTgWG%uOJpdp6s=i~rXHQHgc07R{(&gvl>I*#aW6pLJXqtc>GVv0NmQZR= z$}R`%1=RX9e9ylAep-M3L<7lqRmT_+&@wG>=maH(W=nIS>{c+DvdQ}6!Y6iR-+cdE ze?2Ys1egRtTwy;uo#~$13Llt&`jZt2`y7Ez?AMp7cy0B zqRCJzxjEy9%)UT+!Y1%wC1f(_kwIrzkWOZBGg@208GVsVM1yJkpMYdwNr;SrMcAWR zRYnD~NS+6sBXS`l8UmvgV`gRysS~lzuutx$jRi8Em(NLMe zxD;?OaXFk;h-gHaEozg@88{6-6|%zmsy9nZ?#b3+8Q8{`FU_K1mq!1%HgoWD5%IfHzIRv4aZ@%&fic=n8d z1`c(Woqj|huIvfOYYQ(O-LOE}z%IT!XZG1mK>kYX!fw3O_;iLJ-p=d!s~F{=pNIz1`Nj%*eM^HOa#zD zgFLtZxC5~Sx+eqwj*bHf*qZ`sjUD!1je~yxte#ZV-}S;@00000NkvXXu0mjfn*f9f literal 0 HcmV?d00001 diff --git a/src/main/java/crazypants/enderio/ClientProxy.java b/src/main/java/crazypants/enderio/ClientProxy.java index 70365040..1ed0e82e 100644 --- a/src/main/java/crazypants/enderio/ClientProxy.java +++ b/src/main/java/crazypants/enderio/ClientProxy.java @@ -64,6 +64,8 @@ import crazypants.enderio.machine.AbstractMachineRenderer; import crazypants.enderio.machine.attractor.AttractorRenderer; import crazypants.enderio.machine.attractor.BlockAttractor; import crazypants.enderio.machine.attractor.TileAttractor; +import crazypants.enderio.machine.capbank.BlockCapBank; +import crazypants.enderio.machine.capbank.CapBankRenderer; import crazypants.enderio.machine.enchanter.EnchanterModelRenderer; import crazypants.enderio.machine.enchanter.TileEnchanter; import crazypants.enderio.machine.farm.BlockFarmStation; @@ -273,6 +275,13 @@ public class ClientProxy extends CommonProxy { BlockElectricLight.renderId = RenderingRegistry.getNextAvailableRenderId(); RenderingRegistry.registerBlockHandler(new ElectricLightRenderer()); + if(EnderIO.blockCapBank != null) { + BlockCapBank.renderId = RenderingRegistry.getNextAvailableRenderId(); + CapBankRenderer newCbr = new CapBankRenderer(); + RenderingRegistry.registerBlockHandler(newCbr); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockCapBank), newCbr); + } + CapacitorBankRenderer capr = new CapacitorBankRenderer(); MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockCapacitorBank), capr); diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index 8736a5c1..68ac569f 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -82,6 +82,7 @@ import crazypants.enderio.machine.PacketRedstoneMode; import crazypants.enderio.machine.alloy.AlloyRecipeManager; import crazypants.enderio.machine.alloy.BlockAlloySmelter; import crazypants.enderio.machine.attractor.BlockAttractor; +import crazypants.enderio.machine.capbank.BlockCapBank; import crazypants.enderio.machine.crafter.BlockCrafter; import crazypants.enderio.machine.crusher.BlockCrusher; import crazypants.enderio.machine.crusher.CrusherRecipeManager; @@ -219,6 +220,7 @@ public class EnderIO { public static BlockReservoir blockReservoir; public static BlockAlloySmelter blockAlloySmelter; public static BlockCapacitorBank blockCapacitorBank; + public static BlockCapBank blockCapBank; public static BlockWirelessCharger blockWirelessCharger; public static BlockCrusher blockCrusher; public static BlockHyperCube blockHyperCube; @@ -306,6 +308,7 @@ public class EnderIO { blockCrusher = BlockCrusher.create(); blockAlloySmelter = BlockAlloySmelter.create(); blockCapacitorBank = BlockCapacitorBank.create(); + blockCapBank = BlockCapBank.create(); blockPainter = BlockPainter.create(); blockPaintedFence = BlockPaintedFence.create(); diff --git a/src/main/java/crazypants/enderio/GuiHandler.java b/src/main/java/crazypants/enderio/GuiHandler.java index 803dcce4..7a4dd0c7 100644 --- a/src/main/java/crazypants/enderio/GuiHandler.java +++ b/src/main/java/crazypants/enderio/GuiHandler.java @@ -51,6 +51,8 @@ public class GuiHandler implements IGuiHandler { public static final int GUI_ID_XP_OBELISK = 98; public static final int GUI_ID_ANVIL = 99; + public static final int GUI_ID_CAP_BANK = 100; + protected final Map guiHandlers = new HashMap(); public void registerGuiHandler(int id, IGuiHandler handler) { diff --git a/src/main/java/crazypants/enderio/ModObject.java b/src/main/java/crazypants/enderio/ModObject.java index e8f485e4..d547eadd 100644 --- a/src/main/java/crazypants/enderio/ModObject.java +++ b/src/main/java/crazypants/enderio/ModObject.java @@ -42,6 +42,7 @@ public enum ModObject { blockAlloySmelter, blockSolarPanel, blockCapacitorBank, + blockCapBank, blockSagMill, blockHyperCube, blockPowerMonitor, @@ -102,7 +103,7 @@ public enum ModObject { public final String unlocalisedName; private ModObject() { - this.unlocalisedName = name(); + unlocalisedName = name(); } } \ No newline at end of file diff --git a/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java new file mode 100644 index 00000000..f283c6d5 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java @@ -0,0 +1,437 @@ +package crazypants.enderio.machine.capbank; + +import java.util.ArrayList; +import java.util.List; +import java.util.Random; + +import net.minecraft.block.Block; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +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 cpw.mods.fml.common.network.IGuiHandler; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.BlockEio; +import crazypants.enderio.EnderIO; +import crazypants.enderio.GuiHandler; +import crazypants.enderio.ModObject; +import crazypants.enderio.gui.IAdvancedTooltipProvider; +import crazypants.enderio.gui.TooltipAddera; +import crazypants.enderio.machine.IoMode; +import crazypants.enderio.machine.power.PowerDisplayUtil; +import crazypants.enderio.power.PowerHandlerUtil; +import crazypants.enderio.tool.ToolUtil; +import crazypants.enderio.waila.IWailaInfoProvider; + +public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTooltipProvider, IWailaInfoProvider { + + public static int renderId = -1; + + public static BlockCapBank create() { + + BlockCapBank res = new BlockCapBank(); + res.init(); + return res; + } + + @SideOnly(Side.CLIENT) + IIcon overlayIcon; + @SideOnly(Side.CLIENT) + IIcon fillBarIcon; + + @SideOnly(Side.CLIENT) + private IIcon[] blockIcons; + @SideOnly(Side.CLIENT) + private IIcon[] borderIcons; + @SideOnly(Side.CLIENT) + private IIcon[] inputIcons; + @SideOnly(Side.CLIENT) + private IIcon[] outputIcons; + @SideOnly(Side.CLIENT) + private IIcon[] lockedIcons; + + protected BlockCapBank() { + super(ModObject.blockCapBank.unlocalisedName, TileCapBank.class); + setHardness(2.0F); + } + + @Override + protected void init() { + GameRegistry.registerBlock(this, BlockItemCapBank.class, name); + if(teClass != null) { + GameRegistry.registerTileEntity(teClass, name + "TileEntity"); + } + + EnderIO.guiHandler.registerGuiHandler(GuiHandler.GUI_ID_CAP_BANK, this); + setLightOpacity(255); + } + + @Override + @SideOnly(Side.CLIENT) + public void getSubBlocks(Item p_149666_1_, CreativeTabs p_149666_2_, List list) { + int meta = 0; + for (CapBankType type : CapBankType.types()) { + if(type.isCreative()) { + list.add(BlockItemCapBank.createItemStackWithPower(meta, type.getMaxEnergyStored() / 2)); + } else { + list.add(BlockItemCapBank.createItemStackWithPower(meta, 0)); + list.add(BlockItemCapBank.createItemStackWithPower(meta, type.getMaxEnergyStored())); + } + meta++; + } + } + + @Override + public int damageDropped(int par1) { + return par1; + } + + @Override + @SideOnly(Side.CLIENT) + public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + } + + @Override + @SideOnly(Side.CLIENT) + public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + list.add(PowerDisplayUtil.formatStoredPower(PowerHandlerUtil.getStoredEnergyForItem(itemstack), CapBankType.getTypeFromMeta(itemstack.getItemDamage()) + .getMaxEnergyStored())); + } + + @Override + @SideOnly(Side.CLIENT) + public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + TooltipAddera.addDetailedTooltipFromResources(list, itemstack); + } + + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float par7, float par8, float par9) { + + if(ToolUtil.breakBlockWithTool(this, world, x, y, z, entityPlayer)) { + return true; + } + + if(entityPlayer.isSneaking()) { + return false; + } + TileEntity te = world.getTileEntity(x, y, z); + if(!(te instanceof TileCapBank)) { + return false; + } + + if(ToolUtil.isToolEquipped(entityPlayer)) { + + ForgeDirection faceHit = ForgeDirection.getOrientation(side); + TileCapBank tcb = (TileCapBank) te; + tcb.toggleIoModeForFace(faceHit); + if(world.isRemote) { + world.markBlockForUpdate(x, y, z); + } else { + world.notifyBlocksOfNeighborChange(x, y, z, EnderIO.blockCapBank); + world.markBlockForUpdate(x, y, z); + } + + return true; + } + + if(!world.isRemote) { + entityPlayer.openGui(EnderIO.instance, GuiHandler.GUI_ID_CAP_BANK, world, x, y, z); + } + return true; + } + + @Override + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + // TileEntity te = world.getTileEntity(x, y, z); + // if(te instanceof TileCapBank) { + // return new ContainerCapBank(player, player.inventory, ((TileCapBank) te).getController()); + // } + return null; + } + + @Override + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + // TileEntity te = world.getTileEntity(x, y, z); + // if(te instanceof TileCapBank) { + // return new GuiCapBank(player, player.inventory, ((TileCapBank) te).getController()); + // } + return null; + } + + @SideOnly(Side.CLIENT) + @Override + public void registerBlockIcons(IIconRegister IIconRegister) { + blockIcon = IIconRegister.registerIcon("enderio:capacitorBank"); + overlayIcon = IIconRegister.registerIcon("enderio:capacitorBankOverlays"); + fillBarIcon = IIconRegister.registerIcon("enderio:capacitorBankFillBar"); + + blockIcons = new IIcon[CapBankType.types().size()]; + borderIcons = new IIcon[CapBankType.types().size()]; + inputIcons = new IIcon[CapBankType.types().size()]; + outputIcons = new IIcon[CapBankType.types().size()]; + lockedIcons = new IIcon[CapBankType.types().size()]; + int index = 0; + for (CapBankType type : CapBankType.types()) { + blockIcons[index] = IIconRegister.registerIcon(type.getIcon()); + borderIcons[index] = IIconRegister.registerIcon(type.getBorderIcon()); + + inputIcons[index] = IIconRegister.registerIcon(type.getInputIcon()); + outputIcons[index] = IIconRegister.registerIcon(type.getOutputIcon()); + lockedIcons[index] = IIconRegister.registerIcon(type.getLockedIcon()); + + ++index; + } + + } + + @Override + public int getRenderType() { + return renderId; + } + + @Override + public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) { + return true; + } + + @Override + public boolean isOpaqueCube() { + return false; + } + + @Override + public boolean renderAsNormalBlock() { + return false; + } + + @Override + public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { + Block i1 = par1IBlockAccess.getBlock(par2, par3, par4); + return i1 == this ? false : super.shouldSideBeRendered(par1IBlockAccess, par2, par3, par4, par5); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int side, int meta) { + meta = MathHelper.clamp_int(meta, 0, blockIcons.length - 1); + return blockIcons[meta]; + } + + @SideOnly(Side.CLIENT) + public IIcon getBorderIcon(int side, int meta) { + meta = MathHelper.clamp_int(meta, 0, blockIcons.length - 1); + return borderIcons[meta]; + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(IBlockAccess ba, int x, int y, int z, int side) { + TileEntity te = ba.getTileEntity(x, y, z); + if(!(te instanceof TileCapBank)) { + return blockIcons[0]; + } + int meta = ba.getBlockMetadata(x, y, z); + meta = MathHelper.clamp_int(meta, 0, CapBankType.types().size() - 1); + + TileCapBank cb = (TileCapBank) te; + IoMode mode = cb.getIoMode(ForgeDirection.values()[side]); + if(mode == null || mode == IoMode.NONE) { + return blockIcons[meta]; + } + if(mode == IoMode.PULL) { + return inputIcons[meta]; + } + if(mode == IoMode.PUSH) { + return outputIcons[meta]; + } + return lockedIcons[meta]; + } + + // @Override + // public void onBlockAdded(World world, int x, int y, int z) { + // if(world.isRemote) { + // return; + // } + // TileEntity te = world.getTileEntity(x, y, z); + // if(te instanceof TileCapacitorBank) { + // TileCapacitorBank tr = (TileCapacitorBank) te; + // int meta = world.getBlockMetadata(x, y, z); + // if(meta == 1) { + // tr.setCreativeMode(); + // } + // tr.onBlockAdded(); + // } + // } + + // @Override + // public void onNeighborBlockChange(World world, int x, int y, int z, Block blockId) { + // if(world.isRemote) { + // return; + // } + // TileEntity tile = world.getTileEntity(x, y, z); + // if(tile instanceof TileCapBank) { + // TileCapBank te = (TileCapBank) tile; + // te.onNeighborBlockChange(blockId); + // } + // } + + @Override + public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { + ArrayList ret = new ArrayList(); + // if(!world.isRemote) { + // TileEntity te = world.getTileEntity(x, y, z); + // if(te instanceof TileCapBank) { + // TileCapBank cb = (TileCapBank) te; + // cb.onBreakBlock(); + // + // ItemStack itemStack = + // BlockItemCapacitorBank.createItemStackWithPower(cb.doGetEnergyStored()); + // ret.add(itemStack); + // } + // } + return ret; + } + + @Override + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) { + if(!world.isRemote) { + // TileEntity te = world.getTileEntity(x, y, z); + // if(te instanceof TileCapBank) { + // TileCapBank cb = (TileCapBank) te; + // cb.onBreakBlock(); + // + // // If we are not in Creative or blockCapBankAllwaysDrop is set to true, allow the item drop. + // // This option allows creative players to pick up broken capacitor banks + // + // if(!player.capabilities.isCreativeMode || "true".equalsIgnoreCase(System.getProperty("blockCapBankAllwaysDrop"))) { + // ItemStack itemStack = + // BlockItemCapacitorBank.createItemStackWithPower(cb.doGetEnergyStored()); + // if(cb.isCreative()) { + // itemStack.setItemDamage(1); + // } + // 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); + // } + // } + } + return super.removedByPlayer(world, player, x, y, z); + } + + @Override + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { + if(world.isRemote) { + return; + } + TileEntity te = world.getTileEntity(x, y, z); + // if(te instanceof TileCapacitorBank) { + // TileCapacitorBank cb = (TileCapacitorBank) te; + // cb.addEnergy(PowerHandlerUtil.getStoredEnergyForItem(stack)); + // if(player instanceof EntityPlayer) { + // for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + // BlockCoord bc = new BlockCoord(x, y, z); + // bc = bc.getLocation(dir); + // te = world.getTileEntity(bc.x, bc.y, bc.z); + // if(te instanceof TileCapacitorBank) { + // if(((TileCapacitorBank)te).isMaxSize()) { + // ((EntityPlayer)player).addChatComponentMessage(new ChatComponentText("Capacitor bank is at maximum size")); + // } + // } + // } + // + // } + // + // } + world.markBlockForUpdate(x, y, z); + } + + @Override + public int quantityDropped(Random r) { + return 0; + } + + @Override + public void breakBlock(World world, int x, int y, int z, Block par5, int par6) { + if(!world.isRemote && world.getGameRules().getGameRuleBooleanValue("doTileDrops")) { + // TileEntity te = world.getTileEntity(x, y, z); + // if(!(te instanceof TileCapacitorBank)) { + // super.breakBlock(world, x, y, z, par5, par6); + // return; + // } + // TileCapacitorBank cb = (TileCapacitorBank) te; + // Util.dropItems(world, cb, x, y, z, true); + } + world.removeTileEntity(x, y, z); + } + + // @Override + // @SideOnly(Side.CLIENT) + // public AxisAlignedBB getSelectedBoundingBoxFromPool(World world, int x, int y, int z) { + // TileEntity te = world.getTileEntity(x, y, z); + // if(!(te instanceof TileCapacitorBank)) { + // return super.getSelectedBoundingBoxFromPool(world, x, y, z); + // } + // TileCapacitorBank tr = (TileCapacitorBank) te; + // if(!tr.isMultiblock()) { + // return super.getSelectedBoundingBoxFromPool(world, x, y, z); + // } + // + // Vector3d min = new Vector3d(Double.MAX_VALUE, Double.MAX_VALUE, Double.MAX_VALUE); + // Vector3d max = new Vector3d(-Double.MAX_VALUE, -Double.MAX_VALUE, -Double.MAX_VALUE); + // for (BlockCoord bc : tr.multiblock) { + // min.x = Math.min(min.x, bc.x); + // max.x = Math.max(max.x, bc.x + 1); + // min.y = Math.min(min.y, bc.y); + // max.y = Math.max(max.y, bc.y + 1); + // min.z = Math.min(min.z, bc.z); + // max.z = Math.max(max.z, bc.z + 1); + // } + // return AxisAlignedBB.getBoundingBox(min.x, min.y, min.z, max.x, max.y, max.z); + // } + + @Override + public boolean hasComparatorInputOverride() { + return true; + } + + @Override + public int getComparatorInputOverride(World w, int x, int y, int z, int side) { + TileEntity te = w.getTileEntity(x, y, z); + if(te instanceof TileCapBank) { + return ((TileCapBank) te).getComparatorOutput(); + } + return 0; + } + + @Override + public void getWailaInfo(List tooltip, EntityPlayer player, World world, int x, int y, int z) { + // TileEntity te = world.getTileEntity(x, y, z); + // if (te instanceof TileCapBank) { + // TileCapBank cap = (TileCapBank) te; + // String format = Util.TAB + Util.ALIGNRIGHT + EnumChatFormatting.WHITE; + // + // tooltip.add(String.format("%s : %s%s%sRF/t ", Lang.localize("capbank.maxIO"), format, fmt.format(cap.getMaxIO()), Util.TAB + Util.ALIGNRIGHT)); + // tooltip.add(String.format("%s : %s%s%sRF/t ", Lang.localize("capbank.maxIn"), format, fmt.format(cap.getMaxInput()), Util.TAB + Util.ALIGNRIGHT)); + // tooltip.add(String.format("%s : %s%s%sRF/t ", Lang.localize("capbank.maxOut"), format, fmt.format(cap.getMaxOutput()), Util.TAB + Util.ALIGNRIGHT)); + // } + } + + @Override + public int getDefaultDisplayMask(World world, int x, int y, int z) { + return IWailaInfoProvider.BIT_DETAILED; + } +} diff --git a/src/main/java/crazypants/enderio/machine/capbank/BlockItemCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/BlockItemCapBank.java new file mode 100644 index 00000000..e64f5a86 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/capbank/BlockItemCapBank.java @@ -0,0 +1,93 @@ +package crazypants.enderio.machine.capbank; + +import net.minecraft.block.Block; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import cofh.api.energy.IEnergyContainerItem; +import crazypants.enderio.EnderIO; +import crazypants.enderio.EnderIOTab; +import crazypants.enderio.power.PowerHandlerUtil; + +public class BlockItemCapBank extends ItemBlock implements IEnergyContainerItem { + + public static ItemStack createItemStackWithPower(int meta, int storedEnergy) { + ItemStack res = new ItemStack(EnderIO.blockCapBank, 1, meta); + PowerHandlerUtil.setStoredEnergyForItem(res, storedEnergy); + return res; + } + + public BlockItemCapBank() { + super(EnderIO.blockCapBank); + setHasSubtypes(true); + } + + public BlockItemCapBank(Block block) { + super(block); + setHasSubtypes(true); + setCreativeTab(EnderIOTab.tabEnderIO); + } + + @Override + public int getMetadata(int par1) { + return par1; + } + + @Override + public String getUnlocalizedName(ItemStack par1ItemStack) { + return CapBankType.getTypeFromMeta(par1ItemStack.getItemDamage()).getUnlocalizedName(); + } + + @Override + public boolean showDurabilityBar(ItemStack itemStack) { + return !CapBankType.getTypeFromMeta(itemStack.getItemDamage()).isCreative(); + } + + @Override + public double getDurabilityForDisplay(ItemStack itemStack) { + int maxStored = CapBankType.getTypeFromMeta(itemStack.getItemDamage()).getMaxEnergyStored(); + double stored = maxStored - getEnergyStored(itemStack) + 1; + double max = maxStored + 1; + return stored / max; + } + + @Override + public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { + CapBankType type = CapBankType.getTypeFromMeta(container.getItemDamage()); + int energy = getEnergyStored(container); + int maxInput = type.getMaxIO(); + int energyReceived = Math.min(type.getMaxEnergyStored() - energy, Math.min(maxReceive, maxInput)); + + if(!simulate && !type.isCreative()) { + energy += energyReceived; + PowerHandlerUtil.setStoredEnergyForItem(container, energy); + } + return energyReceived; + + } + + @Override + public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { + CapBankType type = CapBankType.getTypeFromMeta(container.getItemDamage()); + int energy = getEnergyStored(container); + int maxOutput = type.getMaxIO(); + int energyExtracted = Math.min(energy, Math.min(maxExtract, maxOutput)); + + if(!simulate && !type.isCreative()) { + energy -= energyExtracted; + PowerHandlerUtil.setStoredEnergyForItem(container, energy); + } + return energyExtracted; + + } + + @Override + public int getEnergyStored(ItemStack container) { + return PowerHandlerUtil.getStoredEnergyForItem(container); + } + + @Override + public int getMaxEnergyStored(ItemStack container) { + return CapBankType.getTypeFromMeta(container.getItemDamage()).getMaxEnergyStored(); + } + +} diff --git a/src/main/java/crazypants/enderio/machine/capbank/CapBankNetwork.java b/src/main/java/crazypants/enderio/machine/capbank/CapBankNetwork.java new file mode 100644 index 00000000..893d769c --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/capbank/CapBankNetwork.java @@ -0,0 +1,86 @@ +package crazypants.enderio.machine.capbank; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +import net.minecraft.world.World; + +public class CapBankNetwork { + + protected final List capBanks = new ArrayList(); + + private int ioCap; + + private long timeAtLastApply; + + public void init(TileCapBank cap, Collection neighbours, World world) { + if(world.isRemote) { + throw new UnsupportedOperationException(); + } + + for (TileCapBank con : neighbours) { + CapBankNetwork network = con.getNetwork(); + if(network != null) { + network.destroyNetwork(); + } + } + setNetwork(world, cap); + notifyNetworkOfUpdate(); + } + + protected void setNetwork(World world, TileCapBank cap) { + if(cap != null && cap.setNetwork(this)) { + addCapBank(cap); + Collection neighbours = NetworkManager.getNeigbours(cap); + for (TileCapBank neighbour : neighbours) { + if(neighbour.getNetwork() == null) { + setNetwork(world, neighbour); + } else if(neighbour.getNetwork() != this) { + neighbour.getNetwork().destroyNetwork(); + setNetwork(world, neighbour); + } + } + } + } + + public void destroyNetwork() { + for (TileCapBank cb : capBanks) { + cb.setNetwork(null); + } + capBanks.clear(); + } + + public void addCapBank(TileCapBank cap) { + if(!capBanks.contains(cap)) { + capBanks.add(cap); + ioCap += cap.getType().getMaxIO(); + } + } + + public int getMaxEnergyRecieved() { + return ioCap; + } + + public void onUpdateEntity(TileCapBank tileCapBank) { + World world = tileCapBank.getWorldObj(); + if(world == null) { + return; + } + if(world.isRemote) { + return; + } + long curTime = world.getTotalWorldTime(); + if(curTime != timeAtLastApply) { + timeAtLastApply = curTime; + powerManager.applyRecievedPower(); + } + } + + public void notifyNetworkOfUpdate() { + for (TileCapBank cb : capBanks) { + cb.getWorldObj().markBlockForUpdate(cb.xCoord, cb.yCoord, cb.zCoord); + } + } + +} diff --git a/src/main/java/crazypants/enderio/machine/capbank/CapBankRenderer.java b/src/main/java/crazypants/enderio/machine/capbank/CapBankRenderer.java new file mode 100644 index 00000000..06ec72c8 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/capbank/CapBankRenderer.java @@ -0,0 +1,104 @@ +package crazypants.enderio.machine.capbank; + +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; +import net.minecraft.world.IBlockAccess; +import net.minecraftforge.client.IItemRenderer; +import net.minecraftforge.common.util.ForgeDirection; + +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import crazypants.enderio.EnderIO; +import crazypants.render.ConnectedTextureRenderer; +import crazypants.render.CubeRenderer; +import crazypants.render.CustomCubeRenderer; +import crazypants.render.RenderUtil; + +public class CapBankRenderer implements ISimpleBlockRenderingHandler, IItemRenderer { + + private ConnectedTextureRenderer connectedTexRenderer; + + public CapBankRenderer() { + connectedTexRenderer = new ConnectedTextureRenderer(); + connectedTexRenderer.setMatchMeta(true); + } + + //------- Block + + @Override + public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { + } + + @Override + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + + int meta = world.getBlockMetadata(x, y, z); + meta = MathHelper.clamp_int(meta, 0, CapBankType.types().size() - 1); + CapBankType type = CapBankType.getTypeFromMeta(meta); + if(!type.isMultiblock()) { + connectedTexRenderer.setForceAllEdges(true); + } else { + connectedTexRenderer.setForceAllEdges(false); + } + connectedTexRenderer.setEdgeTexture(EnderIO.blockCapBank.getBorderIcon(0, meta)); + CustomCubeRenderer.instance.renderBlock(world, block, x, y, z, connectedTexRenderer); + return true; + } + + @Override + public boolean shouldRender3DInInventory(int modelId) { + return true; + } + + @Override + public int getRenderId() { + return BlockCapBank.renderId; + } + + //------- Item + @Override + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + return true; + } + + @Override + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + return true; + } + + @Override + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + + RenderUtil.bindBlockTexture(); + Tessellator tes = Tessellator.instance; + + tes.startDrawingQuads(); + CubeRenderer.render(EnderIO.blockCapBank, item.getItemDamage()); + tes.draw(); + + GL11.glEnable(GL11.GL_POLYGON_OFFSET_FILL); + GL11.glPolygonOffset(-1.0f, -1.0f); + + tes.startDrawingQuads(); + tes.setColorRGBA_F(1, 1, 1, 1); + renderBorder(null, 0, 0, 0, item.getItemDamage()); + tes.draw(); + + GL11.glDisable(GL11.GL_POLYGON_OFFSET_FILL); + + } + + private void renderBorder(IBlockAccess blockAccess, int x, int y, int z, int meta) { + IIcon texture = EnderIO.blockCapBank.getBorderIcon(0, meta); + for (ForgeDirection face : ForgeDirection.VALID_DIRECTIONS) { + RenderUtil.renderConnectedTextureFace(blockAccess, x, y, z, face, texture, + blockAccess == null, false, false); + } + } + +} diff --git a/src/main/java/crazypants/enderio/machine/capbank/CapBankType.java b/src/main/java/crazypants/enderio/machine/capbank/CapBankType.java new file mode 100644 index 00000000..2f442a33 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/capbank/CapBankType.java @@ -0,0 +1,120 @@ +package crazypants.enderio.machine.capbank; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.util.MathHelper; +import crazypants.enderio.config.Config; + +public class CapBankType { + + + private static final CapBankType CREATIVE = new CapBankType("CREATIVE", "tile.blockCapBank.creative", 500000, Config.capacitorBankMaxStorageRF, false, true, + "enderio:capacitorBank", "enderio:capacitorBankCreativeBorder", "enderio:capacitorBankInput", "enderio:capacitorBankOutput", + "enderio:capacitorBankLocked"); + private static final CapBankType BASIC = new CapBankType("BASIC", "tile.blockCapBank.basic", Config.capacitorBankMaxIoRF, Config.capacitorBankMaxStorageRF, + true, + false, "enderio:capacitorBank", "enderio:blankMachinePanel", "enderio:capacitorBankInput", "enderio:capacitorBankOutput", "enderio:capacitorBankLocked"); + private static final CapBankType VIBRANT = new CapBankType("VIBRANT", "tile.blockCapBank.vibrant", Config.capacitorBankMaxIoRF * 4, + Config.capacitorBankMaxStorageRF * 8, + true, false, "enderio:capacitorBank", "enderio:capacitorBankVibrantBorder", "enderio:capacitorBankInput", "enderio:capacitorBankOutput", + "enderio:capacitorBankLocked"); + + private static final List TYPES = new ArrayList(); + + static { + TYPES.add(CREATIVE); + TYPES.add(BASIC); + TYPES.add(VIBRANT); + } + + public static List types() { + return TYPES; + } + + public static CapBankType getTypeFromMeta(int meta) { + meta = MathHelper.clamp_int(meta, 0, TYPES.size() - 1); + return types().get(meta); + } + + public static CapBankType getTypeFromUID(String uid) { + for (CapBankType type : TYPES) { + if(type.uid.equals(uid)) { + return type; + } + } + return BASIC; + } + + private final String uid; + private final String unlocalizedName; + private final int maxIO; + private final int maxStored; + private final boolean isMultiblock; + private final boolean isCreative; + private final String icon; + private final String borderIcon; + private final String inputIcon; + private final String outputIcon; + private final String lockedIcon; + + public CapBankType(String uid, String unlocalizedName, int maxIO, int maxStored, boolean isMultiblock, boolean isCreative, String icon, String borderIcon, + String inputIcon, String outputIcon, String lockedIcon) { + this.uid = uid; + this.unlocalizedName = unlocalizedName; + this.maxIO = maxIO; + this.maxStored = maxStored; + this.isMultiblock = isMultiblock; + this.isCreative = isCreative; + this.icon = icon; + this.borderIcon = borderIcon; + this.inputIcon = inputIcon; + this.outputIcon = outputIcon; + this.lockedIcon = lockedIcon; + } + + public int getMaxIO() { + return maxIO; + } + + public int getMaxEnergyStored() { + return maxStored; + } + + public boolean isMultiblock() { + return isMultiblock; + } + + public boolean isCreative() { + return isCreative; + } + + public String getUnlocalizedName() { + return unlocalizedName; + } + + public String getIcon() { + return icon; + } + + public String getBorderIcon() { + return borderIcon; + } + + public String getInputIcon() { + return inputIcon; + } + + public String getOutputIcon() { + return outputIcon; + } + + public String getLockedIcon() { + return lockedIcon; + } + + public String getUid() { + return uid; + } + +} diff --git a/src/main/java/crazypants/enderio/machine/capbank/ContainerCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/ContainerCapBank.java new file mode 100644 index 00000000..cb37a393 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/capbank/ContainerCapBank.java @@ -0,0 +1,12 @@ +package crazypants.enderio.machine.capbank; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; + +public class ContainerCapBank { + + public ContainerCapBank(EntityPlayer player, InventoryPlayer inventory, CapBankNetwork controller) { + // TODO Auto-generated constructor stub + } + +} diff --git a/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java new file mode 100644 index 00000000..931d1344 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java @@ -0,0 +1,12 @@ +package crazypants.enderio.machine.capbank; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; + +public class GuiCapBank { + + public GuiCapBank(EntityPlayer player, InventoryPlayer inventory, CapBankNetwork controller) { + // TODO Auto-generated constructor stub + } + +} diff --git a/src/main/java/crazypants/enderio/machine/capbank/NetworkManager.java b/src/main/java/crazypants/enderio/machine/capbank/NetworkManager.java new file mode 100644 index 00000000..d9b55cb4 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/capbank/NetworkManager.java @@ -0,0 +1,65 @@ +package crazypants.enderio.machine.capbank; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; + +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; +import crazypants.util.BlockCoord; + +public class NetworkManager { + + @SuppressWarnings({ "rawtypes", "unchecked" }) + public static void ensureValidNetwork(TileCapBank cap) { + World world = cap.getWorldObj(); + Collection neighbours = getNeigbours(cap); + if(reuseNetwork(cap, neighbours, world)) { + return; + } + CapBankNetwork network = new CapBankNetwork(); + network.init(cap, neighbours, world); + return; + } + + public static Collection getNeigbours(TileCapBank cap) { + if(!cap.getType().isMultiblock()) { + return Collections.emptyList(); + } + List res = new ArrayList(); + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + BlockCoord bc = cap.getLocation().getLocation(dir); + TileEntity te = cap.getWorldObj().getTileEntity(bc.x, bc.y, bc.z); + if(te instanceof TileCapBank) { + TileCapBank neighbour = (TileCapBank) te; + if(neighbour.canConnectTo(cap)) { + res.add(neighbour); + } + } + } + return res; + } + + private static boolean reuseNetwork(TileCapBank cap, Collection neighbours, World world) { + CapBankNetwork network = null; + for (TileCapBank conduit : neighbours) { + if(network == null) { + network = conduit.getNetwork(); + } else if(network != conduit.getNetwork()) { + return false; + } + } + if(network == null) { + return false; + } + if(cap.setNetwork(network)) { + network.addCapBank(cap); + network.notifyNetworkOfUpdate(); + return true; + } + return false; + } + +} diff --git a/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java new file mode 100644 index 00000000..ffbeeac1 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java @@ -0,0 +1,334 @@ +package crazypants.enderio.machine.capbank; + +import java.util.EnumMap; +import java.util.Map; +import java.util.Map.Entry; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.MathHelper; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; +import crazypants.enderio.TileEntityEio; +import crazypants.enderio.conduit.IConduitBundle; +import crazypants.enderio.machine.IIoConfigurable; +import crazypants.enderio.machine.IoMode; +import crazypants.enderio.power.IInternalPowerReceptor; +import crazypants.enderio.power.IPowerInterface; +import crazypants.enderio.power.PowerHandlerUtil; +import crazypants.util.BlockCoord; + +public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor, IInventory, IIoConfigurable { + + private Map faceModes; + + private CapBankType type; + + private int energyStored; + + private CapBankNetwork network; + + @Override + public BlockCoord getLocation() { + return new BlockCoord(this); + } + + public CapBankType getType() { + if(type == null) { + type = CapBankType.getTypeFromMeta(getBlockMetadata()); + } + return type; + } + + //---------- Multiblock + + public CapBankNetwork getNetwork() { + return network; + } + + public boolean setNetwork(CapBankNetwork network) { + this.network = network; + return true; + } + + public boolean canConnectTo(TileCapBank cap) { + CapBankType t = getType(); + return t.isMultiblock() && t.getUid().equals(cap.getType().getUid()); + } + + @Override + public void onChunkUnload() { + CapBankNetwork network = getNetwork(); + if(network != null) { + network.destroyNetwork(); + } + } + + @Override + public void updateEntity() { + if(worldObj.isRemote) { + return; + } + updateNetwork(worldObj); + } + + + private void updateNetwork(World world) { + if(getNetwork() == null) { + NetworkManager.ensureValidNetwork(this); + if(getNetwork() != null && !world.isRemote) { + // world.notifyBlocksOfNeighborChange(bundle.getEntity().xCoord, bundle.getEntity().yCoord, bundle.getEntity().zCoord, + // bundle.getEntity().getBlockType()); + } + } + if(getNetwork() != null) { + getNetwork().onUpdateEntity(this); + } + + } + + //---------- IO + + + @Override + public IoMode toggleIoModeForFace(ForgeDirection faceHit) { + IPowerInterface rec = getReceptorForFace(faceHit); + IoMode curMode = getIoMode(faceHit); + if(curMode == IoMode.PULL) { + setIoMode(faceHit, IoMode.PUSH, true); + return IoMode.PUSH; + } + if(curMode == IoMode.PUSH) { + setIoMode(faceHit, IoMode.DISABLED, true); + return IoMode.DISABLED; + } + if(curMode == IoMode.DISABLED) { + if(rec == null || rec.getDelegate() instanceof IConduitBundle) { + setIoMode(faceHit, IoMode.NONE, true); + return IoMode.NONE; + } + } + setIoMode(faceHit, IoMode.PULL, true); + return IoMode.PULL; + } + + @Override + public boolean supportsMode(ForgeDirection faceHit, IoMode mode) { + IPowerInterface rec = getReceptorForFace(faceHit); + if(mode == IoMode.NONE) { + return rec == null || rec.getDelegate() instanceof IConduitBundle; + } + return true; + } + + @Override + public void setIoMode(ForgeDirection faceHit, IoMode mode) { + setIoMode(faceHit, mode, true); + } + + public void setIoMode(ForgeDirection faceHit, IoMode mode, boolean updateReceptors) { + if(mode == IoMode.NONE && faceModes == null) { + return; + } + if(faceModes == null) { + faceModes = new EnumMap(ForgeDirection.class); + } + faceModes.put(faceHit, mode); + + //TODO + // if(updateReceptors) { + // receptorsDirty = true; + // getController().masterReceptorsDirty = true; + // notifyNeighbours = true; + // } + // render = true; + // updateBlock(); + } + + @Override + public IoMode getIoMode(ForgeDirection face) { + if(faceModes == null) { + return IoMode.NONE; + } + IoMode res = faceModes.get(face); + if(res == null) { + return IoMode.NONE; + } + return res; + } + + private IPowerInterface getReceptorForFace(ForgeDirection faceHit) { + BlockCoord checkLoc = new BlockCoord(this).getLocation(faceHit); + TileEntity te = worldObj.getTileEntity(checkLoc.x, checkLoc.y, checkLoc.z); + if(!(te instanceof TileCapBank)) { + return PowerHandlerUtil.create(te); + } + return null; + } + + + //----------- Power + + @Override + public void setEnergyStored(int stored) { + energyStored = MathHelper.clamp_int(stored, 0, getMaxEnergyStored()); + } + + @Override + public int getEnergyStored() { + return energyStored; + } + + @Override + public int getEnergyStored(ForgeDirection from) { + return getEnergyStored(); + } + + @Override + public int getMaxEnergyRecieved(ForgeDirection dir) { + CapBankNetwork con = getNetwork(); + if(con == null) { + getType().getMaxEnergyStored(); + } + return con.getMaxEnergyRecieved(); + } + + @Override + public int getMaxEnergyStored() { + return getType().getMaxEnergyStored(); + } + + @Override + public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { + return PowerHandlerUtil.recieveInternal(this, maxReceive, from, simulate); + } + + @Override + public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) { + return 0; + } + + @Override + public int getMaxEnergyStored(ForgeDirection from) { + return getType().getMaxEnergyStored(); + } + + @Override + public boolean canConnectEnergy(ForgeDirection from) { + return getIoMode(from) != IoMode.DISABLED; + } + + public int getComparatorOutput() { + return (int) (((double) getEnergyStored() / (double) getMaxEnergyStored()) * 15); + } + + @Override + public boolean displayPower() { + return true; + } + + //------------------- Inventory + + @Override + public int getSizeInventory() { + // TODO Auto-generated method stub + return 0; + } + + @Override + public ItemStack getStackInSlot(int p_70301_1_) { + // TODO Auto-generated method stub + return null; + } + + @Override + public ItemStack decrStackSize(int p_70298_1_, int p_70298_2_) { + // TODO Auto-generated method stub + return null; + } + + @Override + public ItemStack getStackInSlotOnClosing(int p_70304_1_) { + // TODO Auto-generated method stub + return null; + } + + @Override + public void setInventorySlotContents(int p_70299_1_, ItemStack p_70299_2_) { + // TODO Auto-generated method stub + + } + + @Override + public String getInventoryName() { + // TODO Auto-generated method stub + return null; + } + + @Override + public boolean hasCustomInventoryName() { + // TODO Auto-generated method stub + return false; + } + + @Override + public int getInventoryStackLimit() { + // TODO Auto-generated method stub + return 0; + } + + @Override + public boolean isUseableByPlayer(EntityPlayer p_70300_1_) { + // TODO Auto-generated method stub + return false; + } + + @Override + public void openInventory() { + } + + @Override + public void closeInventory() { + } + + @Override + public boolean isItemValidForSlot(int p_94041_1_, ItemStack p_94041_2_) { + // TODO Auto-generated method stub + return false; + } + + //---------------- NBT + + @Override + protected void writeCustomNBT(NBTTagCompound nbtRoot) { + + nbtRoot.setString("type", getType().getUid()); + + //face modes + if(faceModes != null) { + nbtRoot.setByte("hasFaces", (byte) 1); + for (Entry e : faceModes.entrySet()) { + nbtRoot.setShort("face" + e.getKey().ordinal(), (short) e.getValue().ordinal()); + } + } + } + + @Override + protected void readCustomNBT(NBTTagCompound nbtRoot) { + + type = CapBankType.getTypeFromUID(nbtRoot.getString("type")); + + if(nbtRoot.hasKey("hasFaces")) { + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + if(nbtRoot.hasKey("face" + dir.ordinal())) { + setIoMode(dir, IoMode.values()[nbtRoot.getShort("face" + dir.ordinal())], false); + } + } + } + + } + +} From 22f826b1a24496e1b58b701d3a74b85c035fa5fe Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Tue, 2 Dec 2014 21:47:42 +0800 Subject: [PATCH 02/12] Client state syncing framework in place. --- .../enderio/machine/capbank/BlockCapBank.java | 105 ++--- .../machine/capbank/CapBankNetwork.java | 86 ---- .../machine/capbank/ContainerCapBank.java | 12 +- .../enderio/machine/capbank/GuiCapBank.java | 394 +++++++++++++++++- .../enderio/machine/capbank/TileCapBank.java | 67 ++- .../capbank/network/CapBankClientNetwork.java | 40 ++ .../capbank/network/CapBankNetwork.java | 182 ++++++++ .../capbank/network/ClientNetworkManager.java | 64 +++ .../capbank/network/NetworkClientState.java | 71 ++++ .../NetworkUtil.java} | 10 +- .../packet/PacketClientStateRequest.java | 49 +++ .../packet/PacketClientStateResponse.java | 62 +++ .../packet/PacketNetworkIdRequest.java | 58 +++ .../packet/PacketNetworkIdResponse.java | 61 +++ .../machine/power/BlockCapacitorBank.java | 1 - .../machine/power/PowerDisplayUtil.java | 10 +- 16 files changed, 1115 insertions(+), 157 deletions(-) delete mode 100644 src/main/java/crazypants/enderio/machine/capbank/CapBankNetwork.java create mode 100644 src/main/java/crazypants/enderio/machine/capbank/network/CapBankClientNetwork.java create mode 100644 src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java create mode 100644 src/main/java/crazypants/enderio/machine/capbank/network/ClientNetworkManager.java create mode 100644 src/main/java/crazypants/enderio/machine/capbank/network/NetworkClientState.java rename src/main/java/crazypants/enderio/machine/capbank/{NetworkManager.java => network/NetworkUtil.java} (84%) create mode 100644 src/main/java/crazypants/enderio/machine/capbank/packet/PacketClientStateRequest.java create mode 100644 src/main/java/crazypants/enderio/machine/capbank/packet/PacketClientStateResponse.java create mode 100644 src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkIdRequest.java create mode 100644 src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkIdResponse.java diff --git a/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java index f283c6d5..10652245 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java @@ -12,6 +12,7 @@ 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.AxisAlignedBB; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; @@ -28,10 +29,18 @@ import crazypants.enderio.ModObject; import crazypants.enderio.gui.IAdvancedTooltipProvider; import crazypants.enderio.gui.TooltipAddera; import crazypants.enderio.machine.IoMode; +import crazypants.enderio.machine.capbank.network.CapBankClientNetwork; +import crazypants.enderio.machine.capbank.network.ClientNetworkManager; +import crazypants.enderio.machine.capbank.packet.PacketClientStateRequest; +import crazypants.enderio.machine.capbank.packet.PacketClientStateResponse; +import crazypants.enderio.machine.capbank.packet.PacketNetworkIdRequest; +import crazypants.enderio.machine.capbank.packet.PacketNetworkIdResponse; import crazypants.enderio.machine.power.PowerDisplayUtil; +import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.PowerHandlerUtil; import crazypants.enderio.tool.ToolUtil; import crazypants.enderio.waila.IWailaInfoProvider; +import crazypants.vecmath.Vector3d; public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTooltipProvider, IWailaInfoProvider { @@ -39,6 +48,11 @@ public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTool public static BlockCapBank create() { + PacketHandler.INSTANCE.registerMessage(PacketClientStateResponse.class, PacketClientStateResponse.class, PacketHandler.nextID(), Side.CLIENT); + PacketHandler.INSTANCE.registerMessage(PacketClientStateRequest.class, PacketClientStateRequest.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage(PacketNetworkIdRequest.class, PacketNetworkIdRequest.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage(PacketNetworkIdResponse.class, PacketNetworkIdResponse.class, PacketHandler.nextID(), Side.CLIENT); + BlockCapBank res = new BlockCapBank(); res.init(); return res; @@ -152,19 +166,19 @@ public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTool @Override public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - // TileEntity te = world.getTileEntity(x, y, z); - // if(te instanceof TileCapBank) { - // return new ContainerCapBank(player, player.inventory, ((TileCapBank) te).getController()); - // } + TileEntity te = world.getTileEntity(x, y, z); + if(te instanceof TileCapBank) { + return new ContainerCapBank(player, player.inventory, (TileCapBank) te); + } return null; } @Override public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - // TileEntity te = world.getTileEntity(x, y, z); - // if(te instanceof TileCapBank) { - // return new GuiCapBank(player, player.inventory, ((TileCapBank) te).getController()); - // } + TileEntity te = world.getTileEntity(x, y, z); + if(te instanceof TileCapBank) { + return new GuiCapBank(player, player.inventory, (TileCapBank) te); + } return null; } @@ -338,24 +352,13 @@ public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTool return; } TileEntity te = world.getTileEntity(x, y, z); - // if(te instanceof TileCapacitorBank) { - // TileCapacitorBank cb = (TileCapacitorBank) te; - // cb.addEnergy(PowerHandlerUtil.getStoredEnergyForItem(stack)); - // if(player instanceof EntityPlayer) { - // for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - // BlockCoord bc = new BlockCoord(x, y, z); - // bc = bc.getLocation(dir); - // te = world.getTileEntity(bc.x, bc.y, bc.z); - // if(te instanceof TileCapacitorBank) { - // if(((TileCapacitorBank)te).isMaxSize()) { - // ((EntityPlayer)player).addChatComponentMessage(new ChatComponentText("Capacitor bank is at maximum size")); - // } - // } - // } - // - // } - // - // } + if(!(te instanceof TileCapBank)) { + return; + } + + TileCapBank cb = (TileCapBank) te; + cb.addEnergy(PowerHandlerUtil.getStoredEnergyForItem(stack)); + world.markBlockForUpdate(x, y, z); } @@ -378,30 +381,32 @@ public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTool world.removeTileEntity(x, y, z); } - // @Override - // @SideOnly(Side.CLIENT) - // public AxisAlignedBB getSelectedBoundingBoxFromPool(World world, int x, int y, int z) { - // TileEntity te = world.getTileEntity(x, y, z); - // if(!(te instanceof TileCapacitorBank)) { - // return super.getSelectedBoundingBoxFromPool(world, x, y, z); - // } - // TileCapacitorBank tr = (TileCapacitorBank) te; - // if(!tr.isMultiblock()) { - // return super.getSelectedBoundingBoxFromPool(world, x, y, z); - // } - // - // Vector3d min = new Vector3d(Double.MAX_VALUE, Double.MAX_VALUE, Double.MAX_VALUE); - // Vector3d max = new Vector3d(-Double.MAX_VALUE, -Double.MAX_VALUE, -Double.MAX_VALUE); - // for (BlockCoord bc : tr.multiblock) { - // min.x = Math.min(min.x, bc.x); - // max.x = Math.max(max.x, bc.x + 1); - // min.y = Math.min(min.y, bc.y); - // max.y = Math.max(max.y, bc.y + 1); - // min.z = Math.min(min.z, bc.z); - // max.z = Math.max(max.z, bc.z + 1); - // } - // return AxisAlignedBB.getBoundingBox(min.x, min.y, min.z, max.x, max.y, max.z); - // } + @Override + @SideOnly(Side.CLIENT) + public AxisAlignedBB getSelectedBoundingBoxFromPool(World world, int x, int y, int z) { + TileEntity te = world.getTileEntity(x, y, z); + if(!(te instanceof TileCapBank)) { + return super.getSelectedBoundingBoxFromPool(world, x, y, z); + } + TileCapBank tr = (TileCapBank) te; + CapBankClientNetwork network = ClientNetworkManager.getInstance().getNetwork(tr); + + if(!tr.getType().isMultiblock() || network == null) { + return super.getSelectedBoundingBoxFromPool(world, x, y, z); + } + + Vector3d min = new Vector3d(Double.MAX_VALUE, Double.MAX_VALUE, Double.MAX_VALUE); + Vector3d max = new Vector3d(-Double.MAX_VALUE, -Double.MAX_VALUE, -Double.MAX_VALUE); + for (TileCapBank bc : network.getMembers()) { + min.x = Math.min(min.x, bc.xCoord); + max.x = Math.max(max.x, bc.xCoord + 1); + min.y = Math.min(min.y, bc.yCoord); + max.y = Math.max(max.y, bc.yCoord + 1); + min.z = Math.min(min.z, bc.zCoord); + max.z = Math.max(max.z, bc.zCoord + 1); + } + return AxisAlignedBB.getBoundingBox(min.x, min.y, min.z, max.x, max.y, max.z); + } @Override public boolean hasComparatorInputOverride() { diff --git a/src/main/java/crazypants/enderio/machine/capbank/CapBankNetwork.java b/src/main/java/crazypants/enderio/machine/capbank/CapBankNetwork.java deleted file mode 100644 index 893d769c..00000000 --- a/src/main/java/crazypants/enderio/machine/capbank/CapBankNetwork.java +++ /dev/null @@ -1,86 +0,0 @@ -package crazypants.enderio.machine.capbank; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import net.minecraft.world.World; - -public class CapBankNetwork { - - protected final List capBanks = new ArrayList(); - - private int ioCap; - - private long timeAtLastApply; - - public void init(TileCapBank cap, Collection neighbours, World world) { - if(world.isRemote) { - throw new UnsupportedOperationException(); - } - - for (TileCapBank con : neighbours) { - CapBankNetwork network = con.getNetwork(); - if(network != null) { - network.destroyNetwork(); - } - } - setNetwork(world, cap); - notifyNetworkOfUpdate(); - } - - protected void setNetwork(World world, TileCapBank cap) { - if(cap != null && cap.setNetwork(this)) { - addCapBank(cap); - Collection neighbours = NetworkManager.getNeigbours(cap); - for (TileCapBank neighbour : neighbours) { - if(neighbour.getNetwork() == null) { - setNetwork(world, neighbour); - } else if(neighbour.getNetwork() != this) { - neighbour.getNetwork().destroyNetwork(); - setNetwork(world, neighbour); - } - } - } - } - - public void destroyNetwork() { - for (TileCapBank cb : capBanks) { - cb.setNetwork(null); - } - capBanks.clear(); - } - - public void addCapBank(TileCapBank cap) { - if(!capBanks.contains(cap)) { - capBanks.add(cap); - ioCap += cap.getType().getMaxIO(); - } - } - - public int getMaxEnergyRecieved() { - return ioCap; - } - - public void onUpdateEntity(TileCapBank tileCapBank) { - World world = tileCapBank.getWorldObj(); - if(world == null) { - return; - } - if(world.isRemote) { - return; - } - long curTime = world.getTotalWorldTime(); - if(curTime != timeAtLastApply) { - timeAtLastApply = curTime; - powerManager.applyRecievedPower(); - } - } - - public void notifyNetworkOfUpdate() { - for (TileCapBank cb : capBanks) { - cb.getWorldObj().markBlockForUpdate(cb.xCoord, cb.yCoord, cb.zCoord); - } - } - -} diff --git a/src/main/java/crazypants/enderio/machine/capbank/ContainerCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/ContainerCapBank.java index cb37a393..40b36b7b 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/ContainerCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/ContainerCapBank.java @@ -1,12 +1,18 @@ package crazypants.enderio.machine.capbank; +import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Container; -public class ContainerCapBank { +public class ContainerCapBank extends Container { - public ContainerCapBank(EntityPlayer player, InventoryPlayer inventory, CapBankNetwork controller) { - // TODO Auto-generated constructor stub + public ContainerCapBank(Entity player, InventoryPlayer inventory, TileCapBank cb) { + } + + @Override + public boolean canInteractWith(EntityPlayer p_75145_1_) { + return true; } } diff --git a/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java index 931d1344..79b92d20 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java @@ -1,12 +1,396 @@ package crazypants.enderio.machine.capbank; -import net.minecraft.entity.player.EntityPlayer; +import java.awt.Rectangle; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.GuiTextField; +import net.minecraft.entity.Entity; import net.minecraft.entity.player.InventoryPlayer; -public class GuiCapBank { +import org.lwjgl.opengl.GL11; + +import crazypants.enderio.EnderIO; +import crazypants.enderio.gui.IconButtonEIO; +import crazypants.enderio.gui.IconEIO; +import crazypants.enderio.gui.RedstoneModeButton; +import crazypants.enderio.machine.GuiMachineBase; +import crazypants.enderio.machine.GuiOverlayIoConfig; +import crazypants.enderio.machine.IRedstoneModeControlable; +import crazypants.enderio.machine.IoMode; +import crazypants.enderio.machine.RedstoneControlMode; +import crazypants.enderio.machine.capbank.network.CapBankClientNetwork; +import crazypants.enderio.machine.capbank.network.ClientNetworkManager; +import crazypants.enderio.machine.capbank.network.NetworkClientState; +import crazypants.enderio.machine.capbank.packet.PacketClientStateRequest; +import crazypants.enderio.machine.power.PowerDisplayUtil; +import crazypants.enderio.network.PacketHandler; +import crazypants.gui.GuiContainerBase; +import crazypants.gui.GuiToolTip; +import crazypants.render.RenderUtil; +import crazypants.util.BlockCoord; +import crazypants.util.Lang; +import crazypants.vecmath.VecmathUtil; + +public class GuiCapBank extends GuiContainerBase { + + private static final NetworkClientState EMPTY_STATE = new NetworkClientState(); + + protected static final int INPUT_BUTTON_ID = 18; + protected static final int OUTPUT_BUTTON_ID = 37; + + protected static final int CONFIG_ID = 377996104; + + private static final int POWER_X = 11 + 18; + private static final int POWER_Y = 9; + private static final int POWER_WIDTH = 10; + private static final int POWER_HEIGHT = 68; + protected static final int BOTTOM_POWER_Y = POWER_Y + POWER_HEIGHT; + + private int inputX = 78 + 24; + private int inputY = 18; + + private int outputX = 78 + 24; + private int outputY = 36; + + private int rightMargin = 8 + 24; + + private final TileCapBank capBank; + + private RedstoneModeButton inputRsButton; + private RedstoneModeButton outputRsButton; + + private GuiTextField maxInputTF; + private GuiTextField maxOutputTF; + + private GuiOverlayIoConfig configOverlay; + private IconButtonEIO configB; + + private NetworkClientState state = EMPTY_STATE; + + public GuiCapBank(Entity player, InventoryPlayer playerInv, TileCapBank te) { + super(new ContainerCapBank(player, playerInv, te)); + capBank = te; + + updateState(); + + xSize = 176 + 42; + + addToolTip(new GuiToolTip(new Rectangle(5, POWER_Y, POWER_WIDTH, POWER_HEIGHT), "") { + + @Override + protected void updateText() { + text.clear(); + text.add(PowerDisplayUtil.formatPower(state.getEnergyStored()) + " " + PowerDisplayUtil.ofStr()); + text.add(PowerDisplayUtil.formatPower(state.getMaxEnergyStored()) + " " + PowerDisplayUtil.abrevation()); + } + + }); + + int x = xSize - rightMargin - GuiMachineBase.BUTTON_SIZE - 21; + int y = inputY; + inputRsButton = new RedstoneModeButton(this, -1, x, y, new IRedstoneModeControlable() { + + @Override + public void setRedstoneControlMode(RedstoneControlMode mode) { + // capBank.setInputControlMode(mode); + // PacketHandler.INSTANCE.sendToServer(new PacketClientState(capBank)); + } + + @Override + public RedstoneControlMode getRedstoneControlMode() { + return RedstoneControlMode.IGNORE;//capBank.getInputControlMode(); + } + }); + inputRsButton.setTooltipKey("enderio.gui.capBank.inputRs"); + + y += 18; + outputRsButton = new RedstoneModeButton(this, -1, x, y, new IRedstoneModeControlable() { + + @Override + public void setRedstoneControlMode(RedstoneControlMode mode) { + // capBank.setOutputControlMode(mode); + // PacketHandler.INSTANCE.sendToServer(new PacketClientState(capBank)); + } + + @Override + public RedstoneControlMode getRedstoneControlMode() { + //return capBank.getOutputControlMode(); + return RedstoneControlMode.IGNORE; + } + }); + outputRsButton.setTooltipKey("enderio.gui.capBank.outputRs"); + + y += 20; + configB = new IconButtonEIO(this, CONFIG_ID, x, y, IconEIO.IO_CONFIG_UP); + configB.setToolTip(Lang.localize("gui.machine.ioMode.overlay.tooltip")); + + List coords = new ArrayList(); + CapBankClientNetwork network = ClientNetworkManager.getInstance().getNetwork(capBank); + if(network != null) { + for (TileCapBank cb : network.getMembers()) { + coords.add(cb.getLocation()); + } + } + if(coords.isEmpty()) { + coords.add(te.getLocation()); + } + + configOverlay = new GuiOverlayIoConfig(coords) { + + @Override + public void setVisible(boolean visible) { + super.setVisible(visible); + configB.setIcon(visible ? IconEIO.IO_CONFIG_DOWN : IconEIO.IO_CONFIG_UP); + } + + @Override + protected String getLabelForMode(IoMode mode) { + if(mode == IoMode.PUSH) { + return Lang.localize("gui.capBank.outputMode"); + } else if(mode == IoMode.PULL) { + return Lang.localize("gui.capBank.inputMode"); + } + return super.getLabelForMode(mode); + } + + }; + addOverlay(configOverlay); - public GuiCapBank(EntityPlayer player, InventoryPlayer inventory, CapBankNetwork controller) { - // TODO Auto-generated constructor stub } -} + @Override + protected void actionPerformed(GuiButton b) { + super.actionPerformed(b); + if(b.id == CONFIG_ID) { + boolean vis = !configOverlay.isVisible(); + configOverlay.setVisible(vis); + } + } + + @Override + public void initGui() { + super.initGui(); + + configB.onGuiInit(); + + int x = guiLeft + xSize - rightMargin - GuiMachineBase.BUTTON_SIZE; + int y = guiTop + inputY; + + FontRenderer fontRenderer = getFontRenderer(); + + inputRsButton.onGuiInit(); + outputRsButton.onGuiInit(); + + x = guiLeft + inputX; + y = guiTop + inputY; + maxInputTF = new GuiTextField(fontRenderer, x, y, 68, 16); + maxInputTF.setCanLoseFocus(true); + maxInputTF.setMaxStringLength(10); + maxInputTF.setFocused(false); + maxInputTF.setText(PowerDisplayUtil.formatPower(getMaxInput())); + + x = guiLeft + outputX; + y = guiTop + outputY; + maxOutputTF = new GuiTextField(fontRenderer, x, y, 68, 16); + maxOutputTF.setCanLoseFocus(true); + maxOutputTF.setMaxStringLength(10); + maxOutputTF.setFocused(true); + maxOutputTF.setText(PowerDisplayUtil.formatPower(getMaxOutput())); + } + + @Override + protected void keyTyped(char par1, int par2) { + super.keyTyped(par1, par2); + if(par1 == 'e') { + super.keyTyped(par1, 1); + } + maxInputTF.textboxKeyTyped(par1, par2); + maxOutputTF.textboxKeyTyped(par1, par2); + updateInputOutput(); + } + + private void updateInputOutput() { + int input = parsePower(maxInputTF); + if(input >= 0 && getMaxInput() != input) { + setMaxInput(input); + } + int output = parsePower(maxOutputTF); + if(output >= 0 && getMaxOutput() != output) { + setMaxOutput(output); + } + } + + private void setMaxOutput(int output) { + if(output != getMaxOutput()) { + // capBank.setMaxOutput(output); + // maxOutputTF.setText(PowerDisplayUtil.formatPower(capBank.getMaxOutput())); + // PacketHandler.INSTANCE.sendToServer(new PacketClientState(capBank)); + } + } + + private void setMaxInput(int input) { + if(input != getMaxInput()) { + // capBank.setMaxInput(input); + // maxInputTF.setText(PowerDisplayUtil.formatPower(capBank.getMaxInput())); + // PacketHandler.INSTANCE.sendToServer(new PacketClientState(capBank)); + } + } + + private int parsePower(GuiTextField tf) { + String txt = tf.getText(); + try { + Integer power = PowerDisplayUtil.parsePower(txt); + if(power == null) { + return -1; + } + return power.intValue(); + } catch (Exception e) { + return -1; + } + } + + @Override + protected void mouseClicked(int par1, int par2, int par3) { + super.mouseClicked(par1, par2, par3); + maxInputTF.mouseClicked(par1, par2, par3); + maxOutputTF.mouseClicked(par1, par2, par3); + } + + @Override + public void updateScreen() { + maxInputTF.updateCursorCounter(); + maxOutputTF.updateCursorCounter(); + } + + @Override + protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { + + requestStateUpdate(); + + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + RenderUtil.bindTexture("enderio:textures/gui/capacitorBank.png"); + int sx = (width - xSize) / 2; + int sy = (height - ySize) / 2; + + drawTexturedModalRect(sx, sy, 0, 0, xSize - 21, ySize); + + int i1 = getEnergyStoredScaled(POWER_HEIGHT); + drawTexturedModalRect(sx + POWER_X, sy + BOTTOM_POWER_Y - i1, 176 + 21, 0, POWER_WIDTH, i1); + + for (int i = 0; i < buttonList.size(); ++i) { + GuiButton guibutton = (GuiButton) buttonList.get(i); + guibutton.drawButton(mc, 0, 0); + } + + maxInputTF.drawTextBox(); + maxOutputTF.drawTextBox(); + + int midX = sx + xSize / 2; + + String str = Lang.localize("gui.capBank.maxIo") + " " + PowerDisplayUtil.formatPower(getMaxIO()) + + " " + PowerDisplayUtil.abrevation() + PowerDisplayUtil.perTickStr(); + FontRenderer fontRenderer = getFontRenderer(); + int swid = fontRenderer.getStringWidth(str); + int x = midX - swid / 2; + int y = guiTop + 5; + + drawString(fontRenderer, str, x, y, -1); + + str = Lang.localize("gui.capBank.maxInput") + ":"; + swid = fontRenderer.getStringWidth(str); + x = guiLeft + inputX - swid - 3; + y = guiTop + inputY + 2; + drawString(fontRenderer, str, x, y, -1); + + str = Lang.localize("gui.capBank.maxOutput") + ":"; + swid = fontRenderer.getStringWidth(str); + x = guiLeft + outputX - swid - 3; + y = guiTop + outputY + 2; + drawString(fontRenderer, str, x, y, -1); + + } + + @Override + public void drawHoveringText(List par1List, int par2, int par3, FontRenderer font) { + GL11.glPushAttrib(GL11.GL_ENABLE_BIT); + GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); + super.drawHoveringText(par1List, par2 + 24, par3, font); + GL11.glPopAttrib(); + GL11.glPopAttrib(); + } + + @Override + public int getGuiLeft() { + return guiLeft + 24; + } + + @Override + public int getGuiTop() { + return guiTop; + } + + @Override + public int getXSize() { + return xSize - 42; + } + + @Override + public int getOverlayOffsetX() { + return 21; + } + + @Override + public FontRenderer getFontRenderer() { + return Minecraft.getMinecraft().fontRenderer; + } + + private int getMaxOutput() { + return state.getMaxOutput(); + } + + private int getMaxInput() { + return state.getMaxInput(); + } + + private int getMaxIO() { + return state.getMaxIO(); + } + + private int getEnergyStoredScaled(int scale) { + return (int) VecmathUtil.clamp(Math.round(scale * getEnergyStoredRatio()), 0, scale); + } + + private double getEnergyStoredRatio() { + return (double) state.getEnergyStored() / state.getMaxEnergyStored(); + } + + private void requestStateUpdate() { + if(EnderIO.proxy.getTickCount() % 2 == 0) { + PacketHandler.INSTANCE.sendToServer(new PacketClientStateRequest(capBank)); + } + updateState(); + } + + private void updateState() { + + NetworkClientState prevState = state; + // + + //System.out.println("GuiCapBank.updateState: " + capBank.getNetworkId()); + state = ClientNetworkManager.getInstance().getClientState(capBank.getNetworkId()); + if(state == null) { + state = EMPTY_STATE; + } + + if(prevState == EMPTY_STATE && maxInputTF != null) { + maxInputTF.setText(PowerDisplayUtil.formatPower(getMaxInput())); + maxOutputTF.setText(PowerDisplayUtil.formatPower(getMaxInput())); + } + + } + +} \ No newline at end of file diff --git a/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java index ffbeeac1..95034f3e 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java @@ -12,10 +12,17 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.TileEntityEio; import crazypants.enderio.conduit.IConduitBundle; import crazypants.enderio.machine.IIoConfigurable; import crazypants.enderio.machine.IoMode; +import crazypants.enderio.machine.capbank.network.CapBankNetwork; +import crazypants.enderio.machine.capbank.network.ClientNetworkManager; +import crazypants.enderio.machine.capbank.network.NetworkUtil; +import crazypants.enderio.machine.capbank.packet.PacketNetworkIdRequest; +import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.IInternalPowerReceptor; import crazypants.enderio.power.IPowerInterface; import crazypants.enderio.power.PowerHandlerUtil; @@ -31,6 +38,9 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor private CapBankNetwork network; + //Client side refernce to look up network state + private int networkId = -1; + @Override public BlockCoord getLocation() { return new BlockCoord(this); @@ -45,6 +55,19 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor //---------- Multiblock + @SideOnly(Side.CLIENT) + public void setNetworkId(int networkId) { + this.networkId = networkId; + if(networkId != -1) { + ClientNetworkManager.getInstance().addToNetwork(networkId, this); + } + } + + @SideOnly(Side.CLIENT) + public int getNetworkId() { + return networkId; + } + public CapBankNetwork getNetwork() { return network; } @@ -61,7 +84,14 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor @Override public void onChunkUnload() { - CapBankNetwork network = getNetwork(); + if(network != null) { + network.destroyNetwork(); + } + } + + @Override + public void invalidate() { + super.invalidate(); if(network != null) { network.destroyNetwork(); } @@ -70,6 +100,9 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor @Override public void updateEntity() { if(worldObj.isRemote) { + if(networkId == -1) { + PacketHandler.INSTANCE.sendToServer(new PacketNetworkIdRequest(this)); + } return; } updateNetwork(worldObj); @@ -78,7 +111,7 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor private void updateNetwork(World world) { if(getNetwork() == null) { - NetworkManager.ensureValidNetwork(this); + NetworkUtil.ensureValidNetwork(this); if(getNetwork() != null && !world.isRemote) { // world.notifyBlocksOfNeighborChange(bundle.getEntity().xCoord, bundle.getEntity().yCoord, bundle.getEntity().zCoord, // bundle.getEntity().getBlockType()); @@ -146,6 +179,9 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor // } // render = true; // updateBlock(); + if(worldObj != null) { + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + } } @Override @@ -172,6 +208,14 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor //----------- Power + public void addEnergy(int energy) { + if(network == null) { + setEnergyStored(getEnergyStored() + energy); + } else { + network.addEnergy(energy); + } + } + @Override public void setEnergyStored(int stored) { energyStored = MathHelper.clamp_int(stored, 0, getMaxEnergyStored()); @@ -189,11 +233,11 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor @Override public int getMaxEnergyRecieved(ForgeDirection dir) { - CapBankNetwork con = getNetwork(); - if(con == null) { - getType().getMaxEnergyStored(); + CapBankNetwork network = getNetwork(); + if(network == null) { + return getType().getMaxIO(); } - return con.getMaxEnergyRecieved(); + return network.getMaxEnergyRecieved(); } @Override @@ -203,7 +247,14 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor @Override public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { - return PowerHandlerUtil.recieveInternal(this, maxReceive, from, simulate); + if(network == null) { + return 0; + } + IoMode mode = getIoMode(from); + if(mode == IoMode.DISABLED || mode == IoMode.PUSH) { + return 0; + } + return network.recieveEnergy(maxReceive, simulate); } @Override @@ -306,6 +357,7 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor protected void writeCustomNBT(NBTTagCompound nbtRoot) { nbtRoot.setString("type", getType().getUid()); + nbtRoot.setInteger("energyStored", energyStored); //face modes if(faceModes != null) { @@ -320,6 +372,7 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor protected void readCustomNBT(NBTTagCompound nbtRoot) { type = CapBankType.getTypeFromUID(nbtRoot.getString("type")); + energyStored = nbtRoot.getInteger("energyStored"); if(nbtRoot.hasKey("hasFaces")) { for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/CapBankClientNetwork.java b/src/main/java/crazypants/enderio/machine/capbank/network/CapBankClientNetwork.java new file mode 100644 index 00000000..eead0530 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/capbank/network/CapBankClientNetwork.java @@ -0,0 +1,40 @@ +package crazypants.enderio.machine.capbank.network; + +import java.util.ArrayList; +import java.util.List; + +import crazypants.enderio.machine.capbank.TileCapBank; + +public class CapBankClientNetwork { + + private final int id; + private final List members = new ArrayList(); + private NetworkClientState state; + + public CapBankClientNetwork(int id) { + this.id = id; + } + + public void setState(NetworkClientState state) { + this.state = state; + } + + public void addMember(TileCapBank capBank) { + members.add(capBank); + } + + public void destroy() { + for (TileCapBank cb : members) { + cb.setNetworkId(-1); + } + } + + public NetworkClientState getState() { + return state; + } + + public List getMembers() { + return members; + } + +} diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java b/src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java new file mode 100644 index 00000000..c1613c30 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java @@ -0,0 +1,182 @@ +package crazypants.enderio.machine.capbank.network; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +import net.minecraft.world.World; +import crazypants.enderio.EnderIO; +import crazypants.enderio.machine.capbank.TileCapBank; +import crazypants.enderio.machine.capbank.packet.PacketClientStateResponse; + +public class CapBankNetwork { + + protected final List capBanks = new ArrayList(); + + private final int id; + + private int maxIO; + + private long timeAtLastApply; + + private long energyStored; + + private long maxEnergyStored; + + public CapBankNetwork(int id) { + this.id = id; + } + + public void init(TileCapBank cap, Collection neighbours, World world) { + if(world.isRemote) { + throw new UnsupportedOperationException(); + } + + for (TileCapBank con : neighbours) { + CapBankNetwork network = con.getNetwork(); + if(network != null) { + network.destroyNetwork(); + } + } + setNetwork(world, cap); + notifyNetworkOfUpdate(); + + EnderIO.packetPipeline.sendToAllAround(new PacketClientStateResponse(this), cap); + + } + + protected void setNetwork(World world, TileCapBank cap) { + if(cap != null && cap.setNetwork(this)) { + addCapBank(cap); + Collection neighbours = NetworkUtil.getNeigbours(cap); + for (TileCapBank neighbour : neighbours) { + if(neighbour.getNetwork() == null) { + setNetwork(world, neighbour); + } else if(neighbour.getNetwork() != this) { + neighbour.getNetwork().destroyNetwork(); + setNetwork(world, neighbour); + } + } + } + } + + public void destroyNetwork() { + distributeEnergy(); + TileCapBank cap = null; + for (TileCapBank cb : capBanks) { + cb.setNetwork(null); + if(cap == null) { + cap = cb; + } + } + capBanks.clear(); + if(cap != null) { + EnderIO.packetPipeline.INSTANCE.sendToAll(new PacketClientStateResponse(this, true)); + } + } + + public void addCapBank(TileCapBank cap) { + if(!capBanks.contains(cap)) { + capBanks.add(cap); + maxIO += cap.getType().getMaxIO(); + energyStored += cap.getEnergyStored(); + maxEnergyStored += cap.getMaxEnergyStored(); + } + } + + public void onUpdateEntity(TileCapBank tileCapBank) { + World world = tileCapBank.getWorldObj(); + if(world == null) { + return; + } + if(world.isRemote) { + return; + } + long curTime = world.getTotalWorldTime(); + if(curTime != timeAtLastApply) { + timeAtLastApply = curTime; + doNetworkTick(); + } + } + + public void notifyNetworkOfUpdate() { + for (TileCapBank cb : capBanks) { + cb.getWorldObj().markBlockForUpdate(cb.xCoord, cb.yCoord, cb.zCoord); + } + } + + private void doNetworkTick() { + + + distributeEnergy(); + } + + public int recieveEnergy(int maxReceive, boolean simulate) { + if(maxReceive <= 0) { + return 0; + } + + long spaceAvailable = maxEnergyStored - energyStored; + if(spaceAvailable > Integer.MAX_VALUE) { + spaceAvailable = Integer.MAX_VALUE; + } + int res = Math.min(maxReceive, (int) spaceAvailable); + if(!simulate) { + addEnergy(res); + } + return res; + } + + public void addEnergy(int energy) { + energyStored += energy; + if(energyStored > maxEnergyStored) { + energyStored = maxEnergyStored; + } else if(energyStored < 0) { + energyStored = 0; + } + } + + public int getId() { + return id; + } + + public NetworkClientState getClientState() { + return new NetworkClientState(this); + } + + public int getMaxEnergyRecieved() { + //TODO + return maxIO; + } + + public int getMaxEnergySent() { + //TODO + return maxIO; + } + + public long getEnergyStored() { + return energyStored; + } + + public long getMaxEnergyStored() { + return maxEnergyStored; + } + + public int getMaxIO() { + return maxIO; + } + + private void distributeEnergy() { + if(capBanks.isEmpty()) { + return; + } + int energyPerCapBank = (int) (energyStored / capBanks.size()); + int remaining = (int) (energyStored % capBanks.size()); + for (TileCapBank cb : capBanks) { + cb.setEnergyStored(energyPerCapBank); + } + TileCapBank cb = capBanks.get(0); + cb.setEnergyStored(cb.getEnergyStored() + remaining); + } + +} diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/ClientNetworkManager.java b/src/main/java/crazypants/enderio/machine/capbank/network/ClientNetworkManager.java new file mode 100644 index 00000000..8393da83 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/capbank/network/ClientNetworkManager.java @@ -0,0 +1,64 @@ +package crazypants.enderio.machine.capbank.network; + +import java.util.HashMap; +import java.util.Map; + +import crazypants.enderio.machine.capbank.TileCapBank; + +public class ClientNetworkManager { + + private static final ClientNetworkManager instance = new ClientNetworkManager(); + + public static ClientNetworkManager getInstance() { + return instance; + } + + private Map networks = new HashMap(); + + ClientNetworkManager() { + } + + public void destroyNetwork(int id) { + System.out.println("ClientNetworkManager.destroyNetwork: " + id); + CapBankClientNetwork res = networks.get(id); + if(res != null) { + res.destroy(); + } + } + + public void updateState(int id, NetworkClientState state) { + CapBankClientNetwork network = getOrCreateNetwork(id); + network.setState(state); + } + + public NetworkClientState getClientState(int id) { + CapBankClientNetwork res = networks.get(id); + if(res == null) { + return null; + } + return res.getState(); + } + + private CapBankClientNetwork getOrCreateNetwork(int id) { + CapBankClientNetwork res = networks.get(id); + if(res == null) { + res = new CapBankClientNetwork(id); + networks.put(id, res); + } + return res; + } + + public void addToNetwork(int id, TileCapBank tileCapBank) { + CapBankClientNetwork network = getOrCreateNetwork(id); + network.addMember(tileCapBank); + + } + + public CapBankClientNetwork getNetwork(TileCapBank tr) { + if(tr == null) { + return null; + } + return networks.get(tr.getNetworkId()); + } + +} diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/NetworkClientState.java b/src/main/java/crazypants/enderio/machine/capbank/network/NetworkClientState.java new file mode 100644 index 00000000..4af46b4a --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/capbank/network/NetworkClientState.java @@ -0,0 +1,71 @@ +package crazypants.enderio.machine.capbank.network; + +import io.netty.buffer.ByteBuf; + +public class NetworkClientState { + + private final long energyStored; + private final long maxEnergyStored; + private final int maxIO; + private final int maxInput; + private final int maxOutput; + + public NetworkClientState() { + this(0, 0, 0, 0, 0); + } + + public NetworkClientState(long energyStored, long maxEnergyStored, int maxIO, int maxInput, int maxOutput) { + this.energyStored = energyStored; + this.maxEnergyStored = maxEnergyStored; + this.maxIO = maxIO; + this.maxInput = maxInput; + this.maxOutput = maxOutput; + } + + public NetworkClientState(CapBankNetwork network) { + energyStored = network.getEnergyStored(); + maxEnergyStored = network.getMaxEnergyStored(); + maxIO = network.getMaxIO(); + maxInput = network.getMaxEnergyRecieved(); + maxOutput = network.getMaxEnergySent(); + } + + public void writeToBuf(ByteBuf buf) { + buf.writeLong(energyStored); + buf.writeLong(maxEnergyStored); + buf.writeInt(maxIO); + buf.writeInt(maxInput); + buf.writeInt(maxOutput); + } + + public static NetworkClientState readFromBuf(ByteBuf buf) { + return new NetworkClientState(buf.readLong(), buf.readLong(), buf.readInt(), buf.readInt(), buf.readInt()); + } + + public long getEnergyStored() { + return energyStored; + } + + public long getMaxEnergyStored() { + return maxEnergyStored; + } + + public int getMaxOutput() { + return maxOutput; + } + + public int getMaxInput() { + return maxInput; + } + + public int getMaxIO() { + return maxIO; + } + + @Override + public String toString() { + return "NetworkClientState [energyStored=" + energyStored + ", maxEnergyStored=" + maxEnergyStored + ", maxIO=" + maxIO + ", maxInput=" + maxInput + + ", maxOutput=" + maxOutput + "]"; + } + +} diff --git a/src/main/java/crazypants/enderio/machine/capbank/NetworkManager.java b/src/main/java/crazypants/enderio/machine/capbank/network/NetworkUtil.java similarity index 84% rename from src/main/java/crazypants/enderio/machine/capbank/NetworkManager.java rename to src/main/java/crazypants/enderio/machine/capbank/network/NetworkUtil.java index d9b55cb4..575e638a 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/NetworkManager.java +++ b/src/main/java/crazypants/enderio/machine/capbank/network/NetworkUtil.java @@ -1,16 +1,20 @@ -package crazypants.enderio.machine.capbank; +package crazypants.enderio.machine.capbank.network; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; +import java.util.concurrent.atomic.AtomicInteger; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import crazypants.enderio.machine.capbank.TileCapBank; import crazypants.util.BlockCoord; -public class NetworkManager { +public class NetworkUtil { + + private static AtomicInteger nextID = new AtomicInteger(0); @SuppressWarnings({ "rawtypes", "unchecked" }) public static void ensureValidNetwork(TileCapBank cap) { @@ -19,7 +23,7 @@ public class NetworkManager { if(reuseNetwork(cap, neighbours, world)) { return; } - CapBankNetwork network = new CapBankNetwork(); + CapBankNetwork network = new CapBankNetwork(nextID.getAndIncrement()); network.init(cap, neighbours, world); return; } diff --git a/src/main/java/crazypants/enderio/machine/capbank/packet/PacketClientStateRequest.java b/src/main/java/crazypants/enderio/machine/capbank/packet/PacketClientStateRequest.java new file mode 100644 index 00000000..edcec8b8 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/capbank/packet/PacketClientStateRequest.java @@ -0,0 +1,49 @@ +package crazypants.enderio.machine.capbank.packet; + +import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import crazypants.enderio.machine.capbank.TileCapBank; + +public class PacketClientStateRequest implements IMessage, IMessageHandler { + + private int x; + private int y; + private int z; + + public PacketClientStateRequest() { + } + + public PacketClientStateRequest(TileCapBank capBank) { + x = capBank.xCoord; + y = capBank.yCoord; + z = capBank.zCoord; + } + + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); + } + + @Override + public void fromBytes(ByteBuf buf) { + x = buf.readInt(); + y = buf.readInt(); + z = buf.readInt(); + } + + @Override + public PacketClientStateResponse onMessage(PacketClientStateRequest message, MessageContext ctx) { + EntityPlayer player = ctx.getServerHandler().playerEntity; + TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z); + if(te instanceof TileCapBank) { + return new PacketClientStateResponse(((TileCapBank) te).getNetwork()); + } + return null; + } +} diff --git a/src/main/java/crazypants/enderio/machine/capbank/packet/PacketClientStateResponse.java b/src/main/java/crazypants/enderio/machine/capbank/packet/PacketClientStateResponse.java new file mode 100644 index 00000000..b39b88f3 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/capbank/packet/PacketClientStateResponse.java @@ -0,0 +1,62 @@ +package crazypants.enderio.machine.capbank.packet; + +import io.netty.buffer.ByteBuf; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import crazypants.enderio.machine.capbank.network.CapBankNetwork; +import crazypants.enderio.machine.capbank.network.ClientNetworkManager; +import crazypants.enderio.machine.capbank.network.NetworkClientState; + +public class PacketClientStateResponse implements IMessage, IMessageHandler { + + private int id; + private NetworkClientState state; + + public PacketClientStateResponse() { + } + + public PacketClientStateResponse(CapBankNetwork network) { + this(network, false); + } + + public PacketClientStateResponse(CapBankNetwork network, boolean remove) { + id = network.getId(); + if(!remove) { + state = network.getClientState(); + } else { + state = null; + } + } + + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(id); + buf.writeBoolean(state != null); + if(state != null) { + state.writeToBuf(buf); + } + } + + @Override + public void fromBytes(ByteBuf buf) { + id = buf.readInt(); + boolean hasState = buf.readBoolean(); + if(hasState) { + state = NetworkClientState.readFromBuf(buf); + } else { + state = null; + } + } + + @Override + public IMessage onMessage(PacketClientStateResponse message, MessageContext ctx) { + if(message.state != null) { + ClientNetworkManager.getInstance().updateState(message.id, message.state); + } else { + ClientNetworkManager.getInstance().destroyNetwork(message.id); + } + return null; + } + +} diff --git a/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkIdRequest.java b/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkIdRequest.java new file mode 100644 index 00000000..dda32d9f --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkIdRequest.java @@ -0,0 +1,58 @@ +package crazypants.enderio.machine.capbank.packet; + +import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import crazypants.enderio.machine.capbank.TileCapBank; + +public class PacketNetworkIdRequest implements IMessage, IMessageHandler { + + private int x; + private int y; + private int z; + + public PacketNetworkIdRequest() { + } + + public PacketNetworkIdRequest(TileCapBank capBank) { + x = capBank.xCoord; + y = capBank.yCoord; + z = capBank.zCoord; + } + + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); + } + + @Override + public void fromBytes(ByteBuf buf) { + x = buf.readInt(); + y = buf.readInt(); + z = buf.readInt(); + } + + @Override + public PacketNetworkIdResponse onMessage(PacketNetworkIdRequest message, MessageContext ctx) { + EntityPlayer player = ctx.getServerHandler().playerEntity; + TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z); + if(te instanceof TileCapBank) { + TileCapBank capBank = (TileCapBank) te; + if(capBank.getNetwork() != null) { + return new PacketNetworkIdResponse((TileCapBank) te); + } + } + return null; + } + + @Override + public String toString() { + return "PacketNetworkIdRequest [x=" + x + ", y=" + y + ", z=" + z + "]"; + } + +} diff --git a/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkIdResponse.java b/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkIdResponse.java new file mode 100644 index 00000000..cacbac49 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkIdResponse.java @@ -0,0 +1,61 @@ +package crazypants.enderio.machine.capbank.packet; + +import io.netty.buffer.ByteBuf; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import crazypants.enderio.EnderIO; +import crazypants.enderio.machine.capbank.TileCapBank; + +public class PacketNetworkIdResponse implements IMessage, IMessageHandler { + + private int id; + private int x; + private int y; + private int z; + + public PacketNetworkIdResponse() { + } + + PacketNetworkIdResponse(TileCapBank capBank) { + if(capBank != null && capBank.getNetwork() != null) { + id = capBank.getNetwork().getId(); + } else { + id = -1; + } + x = capBank.xCoord; + y = capBank.yCoord; + z = capBank.zCoord; + } + + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(id); + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); + } + + @Override + public void fromBytes(ByteBuf buf) { + id = buf.readInt(); + x = buf.readInt(); + y = buf.readInt(); + z = buf.readInt(); + } + + @Override + public IMessage onMessage(PacketNetworkIdResponse message, MessageContext ctx) { + World w = EnderIO.proxy.getClientWorld(); + if(w != null) { + TileEntity te = w.getTileEntity(message.x, message.y, message.z); + if(te instanceof TileCapBank) { + ((TileCapBank) te).setNetworkId(message.id); + } + } + return null; + } + +} diff --git a/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java b/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java index a86fc54c..3d90da3a 100644 --- a/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java +++ b/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java @@ -67,7 +67,6 @@ public class BlockCapacitorBank extends BlockEio implements IGuiHandler, IAdvanc @Override protected void init() { - //super.init(); GameRegistry.registerBlock(this, BlockItemCapacitorBank.class, name); if(teClass != null) { diff --git a/src/main/java/crazypants/enderio/machine/power/PowerDisplayUtil.java b/src/main/java/crazypants/enderio/machine/power/PowerDisplayUtil.java index 69709484..27e0c781 100644 --- a/src/main/java/crazypants/enderio/machine/power/PowerDisplayUtil.java +++ b/src/main/java/crazypants/enderio/machine/power/PowerDisplayUtil.java @@ -6,7 +6,6 @@ import java.text.NumberFormat; import net.minecraft.item.ItemStack; import cofh.api.energy.IEnergyContainerItem; -import crazypants.enderio.config.Config; import crazypants.util.Lang; public class PowerDisplayUtil { @@ -64,13 +63,20 @@ public class PowerDisplayUtil { return formatPower(amount) + "/" + formatPower(capacity) + " " + PowerDisplayUtil.abrevation(); } + public static String formatPower(long amount) { + String str = INT_NF.format(amount); + if(REPLACE_NBSP) { + str = str.replace(NBSP, ' '); + } + return str; + } + public static String formatPower(int powerRF) { String str = INT_NF.format(powerRF); if(REPLACE_NBSP) { str = str.replace(NBSP, ' '); } - return str; } From 1a29d24d09273c2436d917415337d635a002052e Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Wed, 3 Dec 2014 18:24:39 +0800 Subject: [PATCH 03/12] Power input, IO and restone modes working. --- .../enderio/machine/capbank/BlockCapBank.java | 36 ++- .../enderio/machine/capbank/GuiCapBank.java | 127 ++++---- .../enderio/machine/capbank/TileCapBank.java | 121 +++++++- .../capbank/network/CapBankClientNetwork.java | 111 ++++++- .../capbank/network/CapBankNetwork.java | 290 +++++++++++++----- .../capbank/network/ClientNetworkManager.java | 12 +- .../capbank/network/ICapBankNetwork.java | 38 +++ .../capbank/network/NetworkClientState.java | 49 ++- .../machine/capbank/network/NetworkUtil.java | 2 +- .../machine/capbank/packet/PacketCapBank.java | 78 +++++ .../packet/PacketClientStateRequest.java | 49 --- .../capbank/packet/PacketGuiChange.java | 60 ++++ .../packet/PacketNetworkEnergyRequest.java | 23 ++ .../packet/PacketNetworkEnergyResponse.java | 41 +++ .../packet/PacketNetworkIdRequest.java | 45 +-- .../packet/PacketNetworkIdResponse.java | 33 +- .../packet/PacketNetworkStateRequest.java | 20 ++ ...e.java => PacketNetworkStateResponse.java} | 10 +- 18 files changed, 839 insertions(+), 306 deletions(-) create mode 100644 src/main/java/crazypants/enderio/machine/capbank/network/ICapBankNetwork.java create mode 100644 src/main/java/crazypants/enderio/machine/capbank/packet/PacketCapBank.java delete mode 100644 src/main/java/crazypants/enderio/machine/capbank/packet/PacketClientStateRequest.java create mode 100644 src/main/java/crazypants/enderio/machine/capbank/packet/PacketGuiChange.java create mode 100644 src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkEnergyRequest.java create mode 100644 src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkEnergyResponse.java create mode 100644 src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkStateRequest.java rename src/main/java/crazypants/enderio/machine/capbank/packet/{PacketClientStateResponse.java => PacketNetworkStateResponse.java} (77%) diff --git a/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java index 10652245..1e35775f 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java @@ -31,10 +31,13 @@ import crazypants.enderio.gui.TooltipAddera; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.capbank.network.CapBankClientNetwork; import crazypants.enderio.machine.capbank.network.ClientNetworkManager; -import crazypants.enderio.machine.capbank.packet.PacketClientStateRequest; -import crazypants.enderio.machine.capbank.packet.PacketClientStateResponse; +import crazypants.enderio.machine.capbank.packet.PacketGuiChange; +import crazypants.enderio.machine.capbank.packet.PacketNetworkEnergyRequest; +import crazypants.enderio.machine.capbank.packet.PacketNetworkEnergyResponse; import crazypants.enderio.machine.capbank.packet.PacketNetworkIdRequest; import crazypants.enderio.machine.capbank.packet.PacketNetworkIdResponse; +import crazypants.enderio.machine.capbank.packet.PacketNetworkStateRequest; +import crazypants.enderio.machine.capbank.packet.PacketNetworkStateResponse; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.PowerHandlerUtil; @@ -48,10 +51,13 @@ public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTool public static BlockCapBank create() { - PacketHandler.INSTANCE.registerMessage(PacketClientStateResponse.class, PacketClientStateResponse.class, PacketHandler.nextID(), Side.CLIENT); - PacketHandler.INSTANCE.registerMessage(PacketClientStateRequest.class, PacketClientStateRequest.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage(PacketNetworkStateResponse.class, PacketNetworkStateResponse.class, PacketHandler.nextID(), Side.CLIENT); + PacketHandler.INSTANCE.registerMessage(PacketNetworkStateRequest.class, PacketNetworkStateRequest.class, PacketHandler.nextID(), Side.SERVER); PacketHandler.INSTANCE.registerMessage(PacketNetworkIdRequest.class, PacketNetworkIdRequest.class, PacketHandler.nextID(), Side.SERVER); PacketHandler.INSTANCE.registerMessage(PacketNetworkIdResponse.class, PacketNetworkIdResponse.class, PacketHandler.nextID(), Side.CLIENT); + PacketHandler.INSTANCE.registerMessage(PacketNetworkEnergyRequest.class, PacketNetworkEnergyRequest.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage(PacketNetworkEnergyResponse.class, PacketNetworkEnergyResponse.class, PacketHandler.nextID(), Side.CLIENT); + PacketHandler.INSTANCE.registerMessage(PacketGuiChange.class, PacketGuiChange.class, PacketHandler.nextID(), Side.SERVER); BlockCapBank res = new BlockCapBank(); res.init(); @@ -287,17 +293,17 @@ public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTool // } // } - // @Override - // public void onNeighborBlockChange(World world, int x, int y, int z, Block blockId) { - // if(world.isRemote) { - // return; - // } - // TileEntity tile = world.getTileEntity(x, y, z); - // if(tile instanceof TileCapBank) { - // TileCapBank te = (TileCapBank) tile; - // te.onNeighborBlockChange(blockId); - // } - // } + @Override + public void onNeighborBlockChange(World world, int x, int y, int z, Block blockId) { + if(world.isRemote) { + return; + } + TileEntity tile = world.getTileEntity(x, y, z); + if(tile instanceof TileCapBank) { + TileCapBank te = (TileCapBank) tile; + te.onNeighborBlockChange(blockId); + } + } @Override public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { diff --git a/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java index 79b92d20..187437e7 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java @@ -25,7 +25,9 @@ import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.machine.capbank.network.CapBankClientNetwork; import crazypants.enderio.machine.capbank.network.ClientNetworkManager; import crazypants.enderio.machine.capbank.network.NetworkClientState; -import crazypants.enderio.machine.capbank.packet.PacketClientStateRequest; +import crazypants.enderio.machine.capbank.packet.PacketGuiChange; +import crazypants.enderio.machine.capbank.packet.PacketNetworkEnergyRequest; +import crazypants.enderio.machine.capbank.packet.PacketNetworkStateRequest; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.network.PacketHandler; import crazypants.gui.GuiContainerBase; @@ -39,6 +41,8 @@ public class GuiCapBank extends GuiContainerBase { private static final NetworkClientState EMPTY_STATE = new NetworkClientState(); + private static final CapBankClientNetwork NULL_NETWORK = new CapBankClientNetwork(-1); + protected static final int INPUT_BUTTON_ID = 18; protected static final int OUTPUT_BUTTON_ID = 37; @@ -69,7 +73,10 @@ public class GuiCapBank extends GuiContainerBase { private GuiOverlayIoConfig configOverlay; private IconButtonEIO configB; - private NetworkClientState state = EMPTY_STATE; + private CapBankClientNetwork network; + + private int initialStateCount = -1; + private boolean initState = true; public GuiCapBank(Entity player, InventoryPlayer playerInv, TileCapBank te) { super(new ContainerCapBank(player, playerInv, te)); @@ -84,8 +91,8 @@ public class GuiCapBank extends GuiContainerBase { @Override protected void updateText() { text.clear(); - text.add(PowerDisplayUtil.formatPower(state.getEnergyStored()) + " " + PowerDisplayUtil.ofStr()); - text.add(PowerDisplayUtil.formatPower(state.getMaxEnergyStored()) + " " + PowerDisplayUtil.abrevation()); + text.add(PowerDisplayUtil.formatPower(network.getEnergyStored()) + " " + PowerDisplayUtil.ofStr()); + text.add(PowerDisplayUtil.formatPower(network.getMaxEnergyStored()) + " " + PowerDisplayUtil.abrevation()); } }); @@ -96,13 +103,13 @@ public class GuiCapBank extends GuiContainerBase { @Override public void setRedstoneControlMode(RedstoneControlMode mode) { - // capBank.setInputControlMode(mode); - // PacketHandler.INSTANCE.sendToServer(new PacketClientState(capBank)); + network.setInputControlMode(mode); + sendUpdateToServer(); } @Override public RedstoneControlMode getRedstoneControlMode() { - return RedstoneControlMode.IGNORE;//capBank.getInputControlMode(); + return network.getInputControlMode(); } }); inputRsButton.setTooltipKey("enderio.gui.capBank.inputRs"); @@ -112,14 +119,13 @@ public class GuiCapBank extends GuiContainerBase { @Override public void setRedstoneControlMode(RedstoneControlMode mode) { - // capBank.setOutputControlMode(mode); - // PacketHandler.INSTANCE.sendToServer(new PacketClientState(capBank)); + network.setOutputControlMode(mode); + sendUpdateToServer(); } @Override public RedstoneControlMode getRedstoneControlMode() { - //return capBank.getOutputControlMode(); - return RedstoneControlMode.IGNORE; + return network.getOutputControlMode(); } }); outputRsButton.setTooltipKey("enderio.gui.capBank.outputRs"); @@ -130,7 +136,7 @@ public class GuiCapBank extends GuiContainerBase { List coords = new ArrayList(); CapBankClientNetwork network = ClientNetworkManager.getInstance().getNetwork(capBank); - if(network != null) { + if(network != null && network.getMembers().size() < 200) { for (TileCapBank cb : network.getMembers()) { coords.add(cb.getLocation()); } @@ -139,6 +145,7 @@ public class GuiCapBank extends GuiContainerBase { coords.add(te.getLocation()); } + configOverlay = new GuiOverlayIoConfig(coords) { @Override @@ -191,7 +198,6 @@ public class GuiCapBank extends GuiContainerBase { maxInputTF.setCanLoseFocus(true); maxInputTF.setMaxStringLength(10); maxInputTF.setFocused(false); - maxInputTF.setText(PowerDisplayUtil.formatPower(getMaxInput())); x = guiLeft + outputX; y = guiTop + outputY; @@ -199,7 +205,6 @@ public class GuiCapBank extends GuiContainerBase { maxOutputTF.setCanLoseFocus(true); maxOutputTF.setMaxStringLength(10); maxOutputTF.setFocused(true); - maxOutputTF.setText(PowerDisplayUtil.formatPower(getMaxOutput())); } @Override @@ -215,28 +220,34 @@ public class GuiCapBank extends GuiContainerBase { private void updateInputOutput() { int input = parsePower(maxInputTF); - if(input >= 0 && getMaxInput() != input) { + if(input >= 0 && network.getMaxEnergyRecieved() != input) { setMaxInput(input); } int output = parsePower(maxOutputTF); - if(output >= 0 && getMaxOutput() != output) { + if(output >= 0 && network.getMaxEnergySent() != output) { setMaxOutput(output); } } private void setMaxOutput(int output) { - if(output != getMaxOutput()) { - // capBank.setMaxOutput(output); - // maxOutputTF.setText(PowerDisplayUtil.formatPower(capBank.getMaxOutput())); - // PacketHandler.INSTANCE.sendToServer(new PacketClientState(capBank)); + if(output != network.getMaxEnergySent()) { + network.setMaxEnergySend(output); + maxOutputTF.setText(PowerDisplayUtil.formatPower(network.getMaxEnergySent())); + sendUpdateToServer(); } } private void setMaxInput(int input) { - if(input != getMaxInput()) { - // capBank.setMaxInput(input); - // maxInputTF.setText(PowerDisplayUtil.formatPower(capBank.getMaxInput())); - // PacketHandler.INSTANCE.sendToServer(new PacketClientState(capBank)); + if(input != network.getMaxEnergyRecieved()) { + network.setMaxEnergyReccieved(input); + maxInputTF.setText(PowerDisplayUtil.formatPower(network.getMaxEnergyRecieved())); + sendUpdateToServer(); + } + } + + protected void sendUpdateToServer() { + if(network != NULL_NETWORK) { + PacketHandler.INSTANCE.sendToServer(new PacketGuiChange(capBank, network)); } } @@ -291,7 +302,7 @@ public class GuiCapBank extends GuiContainerBase { int midX = sx + xSize / 2; - String str = Lang.localize("gui.capBank.maxIo") + " " + PowerDisplayUtil.formatPower(getMaxIO()) + + String str = Lang.localize("gui.capBank.maxIo") + " " + PowerDisplayUtil.formatPower(network.getMaxIO()) + " " + PowerDisplayUtil.abrevation() + PowerDisplayUtil.perTickStr(); FontRenderer fontRenderer = getFontRenderer(); int swid = fontRenderer.getStringWidth(str); @@ -348,49 +359,51 @@ public class GuiCapBank extends GuiContainerBase { return Minecraft.getMinecraft().fontRenderer; } - private int getMaxOutput() { - return state.getMaxOutput(); - } - - private int getMaxInput() { - return state.getMaxInput(); - } - - private int getMaxIO() { - return state.getMaxIO(); - } - private int getEnergyStoredScaled(int scale) { - return (int) VecmathUtil.clamp(Math.round(scale * getEnergyStoredRatio()), 0, scale); - } - - private double getEnergyStoredRatio() { - return (double) state.getEnergyStored() / state.getMaxEnergyStored(); + return (int) VecmathUtil.clamp(Math.round(scale * network.getEnergyStoredRatio()), 0, scale); } private void requestStateUpdate() { if(EnderIO.proxy.getTickCount() % 2 == 0) { - PacketHandler.INSTANCE.sendToServer(new PacketClientStateRequest(capBank)); + if(!updateState()) { + PacketHandler.INSTANCE.sendToServer(new PacketNetworkEnergyRequest(capBank)); + } } - updateState(); } - private void updateState() { - - NetworkClientState prevState = state; - // - - //System.out.println("GuiCapBank.updateState: " + capBank.getNetworkId()); - state = ClientNetworkManager.getInstance().getClientState(capBank.getNetworkId()); - if(state == null) { - state = EMPTY_STATE; + private boolean updateState() { + if(!initState) { + return false; } - if(prevState == EMPTY_STATE && maxInputTF != null) { - maxInputTF.setText(PowerDisplayUtil.formatPower(getMaxInput())); - maxOutputTF.setText(PowerDisplayUtil.formatPower(getMaxInput())); + if(capBank.getNetworkId() == -1) { + network = NULL_NETWORK; + return true; } - + if(network == null || network == NULL_NETWORK) { + network = ClientNetworkManager.getInstance().getOrCreateNetwork(capBank.getNetworkId()); + initialStateCount = network.getStateUpdateCount(); + PacketHandler.INSTANCE.sendToServer(new PacketNetworkStateRequest(capBank)); + return true; + } + if(network.getStateUpdateCount() == initialStateCount) { + PacketHandler.INSTANCE.sendToServer(new PacketNetworkStateRequest(capBank)); + return true; + } + if(network.getStateUpdateCount() > initialStateCount) { + updateFieldsFromState(); + initState = false; + return true; + } + return false; } + private void updateFieldsFromState() { + maxInputTF.setText(PowerDisplayUtil.formatPower(network.getMaxEnergyRecieved())); + maxOutputTF.setText(PowerDisplayUtil.formatPower(network.getMaxEnergySent())); + inputRsButton.setMode(network.getInputControlMode()); + outputRsButton.setMode(network.getOutputControlMode()); + } + + } \ No newline at end of file diff --git a/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java index 95034f3e..4e1d1c91 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java @@ -4,6 +4,7 @@ import java.util.EnumMap; import java.util.Map; import java.util.Map.Entry; +import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -18,6 +19,7 @@ import crazypants.enderio.TileEntityEio; import crazypants.enderio.conduit.IConduitBundle; import crazypants.enderio.machine.IIoConfigurable; import crazypants.enderio.machine.IoMode; +import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.machine.capbank.network.CapBankNetwork; import crazypants.enderio.machine.capbank.network.ClientNetworkManager; import crazypants.enderio.machine.capbank.network.NetworkUtil; @@ -35,11 +37,20 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor private CapBankType type; private int energyStored; + private int maxInput = -1; + private int maxOutput = -1; + + private RedstoneControlMode inputControlMode = RedstoneControlMode.IGNORE; + private RedstoneControlMode outputControlMode = RedstoneControlMode.IGNORE; + + private boolean redstoneStateDirty = true; + private boolean isRecievingRedstoneSignal; private CapBankNetwork network; //Client side refernce to look up network state private int networkId = -1; + private int idRequestTimer = 0; @Override public BlockCoord getLocation() { @@ -53,6 +64,10 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor return type; } + public void onNeighborBlockChange(Block blockId) { + redstoneStateDirty = true; + } + //---------- Multiblock @SideOnly(Side.CLIENT) @@ -101,21 +116,31 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor public void updateEntity() { if(worldObj.isRemote) { if(networkId == -1) { - PacketHandler.INSTANCE.sendToServer(new PacketNetworkIdRequest(this)); + if(idRequestTimer <= 0) { + PacketHandler.INSTANCE.sendToServer(new PacketNetworkIdRequest(this)); + idRequestTimer = 5; + } else { + --idRequestTimer; + } } return; } updateNetwork(worldObj); - } + if(network == null) { + return; + } + if(redstoneStateDirty) { + int sig = worldObj.getStrongestIndirectPower(xCoord, yCoord, zCoord); + boolean recievingSignal = sig > 0; + network.updateRedstoneSignal(this, recievingSignal); + redstoneStateDirty = false; + } + } private void updateNetwork(World world) { if(getNetwork() == null) { NetworkUtil.ensureValidNetwork(this); - if(getNetwork() != null && !world.isRemote) { - // world.notifyBlocksOfNeighborChange(bundle.getEntity().xCoord, bundle.getEntity().yCoord, bundle.getEntity().zCoord, - // bundle.getEntity().getBlockType()); - } } if(getNetwork() != null) { getNetwork().onUpdateEntity(this); @@ -125,7 +150,6 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor //---------- IO - @Override public IoMode toggleIoModeForFace(ForgeDirection faceHit) { IPowerInterface rec = getReceptorForFace(faceHit); @@ -181,6 +205,7 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor // updateBlock(); if(worldObj != null) { worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, blockType); } } @@ -205,6 +230,23 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor return null; } + //----------- Redstone + + public RedstoneControlMode getInputControlMode() { + return inputControlMode; + } + + public void setInputControlMode(RedstoneControlMode inputControlMode) { + this.inputControlMode = inputControlMode; + } + + public RedstoneControlMode getOutputControlMode() { + return outputControlMode; + } + + public void setOutputControlMode(RedstoneControlMode outputControlMode) { + this.outputControlMode = outputControlMode; + } //----------- Power @@ -231,18 +273,40 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor return getEnergyStored(); } + @Override + public int getMaxEnergyStored() { + return getType().getMaxEnergyStored(); + } + @Override public int getMaxEnergyRecieved(ForgeDirection dir) { - CapBankNetwork network = getNetwork(); if(network == null) { return getType().getMaxIO(); } return network.getMaxEnergyRecieved(); } - @Override - public int getMaxEnergyStored() { - return getType().getMaxEnergyStored(); + public int getMaxEnergySent() { + if(network == null) { + return getType().getMaxIO(); + } + return network.getMaxEnergySent(); + } + + public void setMaxEnergyRecieved(int maxInput) { + this.maxInput = maxInput; + } + + public void setMaxEnergySend(int maxOutput) { + this.maxOutput = maxOutput; + } + + public int getMaxEnergySentOverride() { + return maxOutput; + } + + public int getMaxEnergyRecievedOverride() { + return maxInput; } @Override @@ -359,6 +423,19 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor nbtRoot.setString("type", getType().getUid()); nbtRoot.setInteger("energyStored", energyStored); + if(maxInput != -1) { + nbtRoot.setInteger("maxInput", maxInput); + } + if(maxOutput != -1) { + nbtRoot.setInteger("maxOutput", maxOutput); + } + if(inputControlMode != RedstoneControlMode.IGNORE) { + nbtRoot.setShort("inputControlMode", (short) inputControlMode.ordinal()); + } + if(outputControlMode != RedstoneControlMode.IGNORE) { + nbtRoot.setShort("outputControlMode", (short) outputControlMode.ordinal()); + } + //face modes if(faceModes != null) { nbtRoot.setByte("hasFaces", (byte) 1); @@ -374,6 +451,28 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor type = CapBankType.getTypeFromUID(nbtRoot.getString("type")); energyStored = nbtRoot.getInteger("energyStored"); + if(nbtRoot.hasKey("maxInput")) { + maxInput = nbtRoot.getInteger("maxInput"); + } else { + maxInput = -1; + } + if(nbtRoot.hasKey("maxOutput")) { + maxOutput = nbtRoot.getInteger("maxOutput"); + } else { + maxOutput = -1; + } + + if(nbtRoot.hasKey("inputControlMode")) { + inputControlMode = RedstoneControlMode.values()[nbtRoot.getShort("inputControlMode")]; + } else { + inputControlMode = RedstoneControlMode.IGNORE; + } + if(nbtRoot.hasKey("outputControlMode")) { + outputControlMode = RedstoneControlMode.values()[nbtRoot.getShort("outputControlMode")]; + } else { + outputControlMode = RedstoneControlMode.IGNORE; + } + if(nbtRoot.hasKey("hasFaces")) { for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { if(nbtRoot.hasKey("face" + dir.ordinal())) { diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/CapBankClientNetwork.java b/src/main/java/crazypants/enderio/machine/capbank/network/CapBankClientNetwork.java index eead0530..db604b64 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/network/CapBankClientNetwork.java +++ b/src/main/java/crazypants/enderio/machine/capbank/network/CapBankClientNetwork.java @@ -3,38 +3,133 @@ package crazypants.enderio.machine.capbank.network; import java.util.ArrayList; import java.util.List; +import net.minecraft.util.MathHelper; +import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.machine.capbank.TileCapBank; -public class CapBankClientNetwork { +public class CapBankClientNetwork implements ICapBankNetwork { private final int id; private final List members = new ArrayList(); - private NetworkClientState state; + private int maxEnergySent; + private int maxEnergyRecieved; + + private int stateUpdateCount = 0; + private int maxIO; + private long maxEnergyStored; + private long energyStored; + + private RedstoneControlMode inputControlMode = RedstoneControlMode.IGNORE; + private RedstoneControlMode outputControlMode = RedstoneControlMode.IGNORE; public CapBankClientNetwork(int id) { this.id = id; } + @Override + public int getId() { + return id; + } + public void setState(NetworkClientState state) { - this.state = state; + maxEnergyRecieved = state.getMaxInput(); + maxEnergySent = state.getMaxOutput(); + maxIO = state.getMaxIO(); + maxEnergyStored = state.getMaxEnergyStored(); + energyStored = state.getEnergyStored(); + inputControlMode = state.getInputMode(); + outputControlMode = state.getOutputMode(); + stateUpdateCount++; + } + + public int getStateUpdateCount() { + return stateUpdateCount; + } + + public void setStateUpdateCount(int stateUpdateCount) { + this.stateUpdateCount = stateUpdateCount; } public void addMember(TileCapBank capBank) { members.add(capBank); } - public void destroy() { + @Override + public List getMembers() { + return members; + } + + @Override + public void destroyNetwork() { for (TileCapBank cb : members) { cb.setNetworkId(-1); } } - public NetworkClientState getState() { - return state; + @Override + public int getMaxIO() { + return maxIO; } - public List getMembers() { - return members; + @Override + public long getMaxEnergyStored() { + return maxEnergyStored; + } + + public void setEnergyStored(long energyStored) { + this.energyStored = energyStored; + } + + @Override + public long getEnergyStored() { + return energyStored; + } + + @Override + public int getMaxEnergySent() { + return maxEnergySent; + } + + @Override + public void setMaxEnergySend(int max) { + maxEnergySent = MathHelper.clamp_int(max, 0, maxIO); + } + + @Override + public int getMaxEnergyRecieved() { + return maxEnergyRecieved; + } + + @Override + public void setMaxEnergyReccieved(int max) { + maxEnergyRecieved = MathHelper.clamp_int(max, 0, maxIO); + } + + public double getEnergyStoredRatio() { + if(getMaxEnergyStored() <= 0) { + return 0; + } + return (double) getEnergyStored() / getMaxEnergyStored(); + } + + @Override + public RedstoneControlMode getInputControlMode() { + return inputControlMode; + } + + @Override + public void setInputControlMode(RedstoneControlMode inputControlMode) { + this.inputControlMode = inputControlMode; + } + + @Override + public RedstoneControlMode getOutputControlMode() { + return outputControlMode; + } + + @Override + public void setOutputControlMode(RedstoneControlMode outputControlMode) { + this.outputControlMode = outputControlMode; } } diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java b/src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java index c1613c30..cdcf74fc 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java +++ b/src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java @@ -2,14 +2,21 @@ package crazypants.enderio.machine.capbank.network; import java.util.ArrayList; import java.util.Collection; +import java.util.HashSet; import java.util.List; +import java.util.Set; import net.minecraft.world.World; import crazypants.enderio.EnderIO; +import crazypants.enderio.machine.RedstoneControlMode; +import crazypants.enderio.machine.capbank.CapBankType; import crazypants.enderio.machine.capbank.TileCapBank; -import crazypants.enderio.machine.capbank.packet.PacketClientStateResponse; +import crazypants.enderio.machine.capbank.packet.PacketNetworkStateResponse; +import crazypants.util.BlockCoord; -public class CapBankNetwork { +public class CapBankNetwork implements ICapBankNetwork { + + private static final int IO_CAP = 2000000000; protected final List capBanks = new ArrayList(); @@ -17,34 +24,59 @@ public class CapBankNetwork { private int maxIO; + private int maxInput = -1; + + private int maxOutput = -1; + private long timeAtLastApply; private long energyStored; + private long prevEnergyStored = -1; private long maxEnergyStored; + private CapBankType type; + + private Set redstoneRecievers = new HashSet(); + + private RedstoneControlMode inputControlMode = RedstoneControlMode.IGNORE; + private RedstoneControlMode outputControlMode = RedstoneControlMode.IGNORE; + + private boolean inputRedstoneConditionMet = true; + private boolean outputRedstoneConditionMet = true; + + public CapBankNetwork(int id) { this.id = id; } + //--------- Network Management + public void init(TileCapBank cap, Collection neighbours, World world) { if(world.isRemote) { throw new UnsupportedOperationException(); } + type = cap.getType(); + inputControlMode = cap.getInputControlMode(); + outputControlMode = cap.getOutputControlMode(); for (TileCapBank con : neighbours) { - CapBankNetwork network = con.getNetwork(); + ICapBankNetwork network = con.getNetwork(); if(network != null) { network.destroyNetwork(); } } setNetwork(world, cap); - notifyNetworkOfUpdate(); - - EnderIO.packetPipeline.sendToAllAround(new PacketClientStateResponse(this), cap); - + //notifyNetworkOfUpdate(); + EnderIO.packetPipeline.sendToAllAround(new PacketNetworkStateResponse(this), cap); } + //public void notifyNetworkOfUpdate() { + // for (TileCapBank cb : capBanks) { + // cb.getWorldObj().markBlockForUpdate(cb.xCoord, cb.yCoord, cb.zCoord); + // } + // } + protected void setNetwork(World world, TileCapBank cap) { if(cap != null && cap.setNetwork(this)) { addCapBank(cap); @@ -60,6 +92,7 @@ public class CapBankNetwork { } } + @Override public void destroyNetwork() { distributeEnergy(); TileCapBank cap = null; @@ -71,19 +104,48 @@ public class CapBankNetwork { } capBanks.clear(); if(cap != null) { - EnderIO.packetPipeline.INSTANCE.sendToAll(new PacketClientStateResponse(this, true)); + EnderIO.packetPipeline.INSTANCE.sendToAll(new PacketNetworkStateResponse(this, true)); } } + @Override + public List getMembers() { + return capBanks; + } + public void addCapBank(TileCapBank cap) { if(!capBanks.contains(cap)) { capBanks.add(cap); - maxIO += cap.getType().getMaxIO(); + long newIO = maxIO + cap.getType().getMaxIO(); + if(newIO > IO_CAP) { + newIO = IO_CAP; + } + maxIO = (int) newIO; + energyStored += cap.getEnergyStored(); maxEnergyStored += cap.getMaxEnergyStored(); + if(maxInput == -1) { + maxInput = cap.getMaxEnergyRecievedOverride(); + } + if(maxOutput == -1) { + maxOutput = cap.getMaxEnergySentOverride(); + } + cap.setInputControlMode(inputControlMode); + cap.setOutputControlMode(outputControlMode); } } + @Override + public int getId() { + return id; + } + + public NetworkClientState getClientState() { + return new NetworkClientState(this); + } + + //--------- Tick Handling + public void onUpdateEntity(TileCapBank tileCapBank) { World world = tileCapBank.getWorldObj(); if(world == null) { @@ -99,71 +161,11 @@ public class CapBankNetwork { } } - public void notifyNetworkOfUpdate() { - for (TileCapBank cb : capBanks) { - cb.getWorldObj().markBlockForUpdate(cb.xCoord, cb.yCoord, cb.zCoord); - } - } - private void doNetworkTick() { - - - distributeEnergy(); - } - - public int recieveEnergy(int maxReceive, boolean simulate) { - if(maxReceive <= 0) { - return 0; + if(energyStored != prevEnergyStored) { + distributeEnergy(); } - - long spaceAvailable = maxEnergyStored - energyStored; - if(spaceAvailable > Integer.MAX_VALUE) { - spaceAvailable = Integer.MAX_VALUE; - } - int res = Math.min(maxReceive, (int) spaceAvailable); - if(!simulate) { - addEnergy(res); - } - return res; - } - - public void addEnergy(int energy) { - energyStored += energy; - if(energyStored > maxEnergyStored) { - energyStored = maxEnergyStored; - } else if(energyStored < 0) { - energyStored = 0; - } - } - - public int getId() { - return id; - } - - public NetworkClientState getClientState() { - return new NetworkClientState(this); - } - - public int getMaxEnergyRecieved() { - //TODO - return maxIO; - } - - public int getMaxEnergySent() { - //TODO - return maxIO; - } - - public long getEnergyStored() { - return energyStored; - } - - public long getMaxEnergyStored() { - return maxEnergyStored; - } - - public int getMaxIO() { - return maxIO; + prevEnergyStored = energyStored; } private void distributeEnergy() { @@ -179,4 +181,148 @@ public class CapBankNetwork { cb.setEnergyStored(cb.getEnergyStored() + remaining); } + //------ Power + + public int recieveEnergy(int maxReceive, boolean simulate) { + if(maxReceive <= 0 || !inputRedstoneConditionMet) { + return 0; + } + + long spaceAvailable = maxEnergyStored - energyStored; + if(spaceAvailable > Integer.MAX_VALUE) { + spaceAvailable = Integer.MAX_VALUE; + } + int res = Math.min(maxReceive, (int) spaceAvailable); + res = Math.min(maxReceive, getMaxEnergyRecieved()); + if(!simulate && !type.isCreative()) { + addEnergy(res); + } + return res; + } + + public void addEnergy(int energy) { + energyStored += energy; + if(energyStored > maxEnergyStored) { + energyStored = maxEnergyStored; + } else if(energyStored < 0) { + energyStored = 0; + } + } + + + @Override + public long getEnergyStored() { + return energyStored; + } + + @Override + public long getMaxEnergyStored() { + return maxEnergyStored; + } + + @Override + public int getMaxIO() { + return maxIO; + } + + //----- IO overrides + + @Override + public int getMaxEnergyRecieved() { + if(maxInput == -1) { + return maxIO; + } + return Math.min(maxInput, maxIO); + } + + @Override + public int getMaxEnergySent() { + if(maxOutput == -1) { + return maxIO; + } + return Math.min(maxOutput, maxIO); + } + + @Override + public void setMaxEnergyReccieved(int max) { + if(max >= maxIO) { + maxInput = -1; + } else if(max < 0) { + maxInput = 0; + } else { + maxInput = max; + } + for (TileCapBank cb : capBanks) { + cb.setMaxEnergyRecieved(maxInput); + } + } + + @Override + public void setMaxEnergySend(int max) { + if(max >= maxIO) { + maxOutput = -1; + } else if(max < 0) { + maxOutput = 0; + } else { + maxOutput = max; + } + for (TileCapBank cb : capBanks) { + cb.setMaxEnergySend(maxOutput); + } + } + + + + //----------- Redstone + + @Override + public RedstoneControlMode getInputControlMode() { + return inputControlMode; + } + + @Override + public void setInputControlMode(RedstoneControlMode inputControlMode) { + if(this.inputControlMode == inputControlMode) { + return; + } + this.inputControlMode = inputControlMode; + for (TileCapBank capBank : capBanks) { + capBank.setInputControlMode(inputControlMode); + } + updateRedstoneConditions(); + } + + @Override + public RedstoneControlMode getOutputControlMode() { + return outputControlMode; + } + + @Override + public void setOutputControlMode(RedstoneControlMode outputControlMode) { + if(this.outputControlMode == outputControlMode) { + return; + } + this.outputControlMode = outputControlMode; + for (TileCapBank capBank : capBanks) { + capBank.setOutputControlMode(outputControlMode); + } + updateRedstoneConditions(); + } + + public void updateRedstoneSignal(TileCapBank tileCapBank, boolean recievingSignal) { + if(recievingSignal) { + redstoneRecievers.add(tileCapBank.getLocation()); + } else { + redstoneRecievers.remove(tileCapBank.getLocation()); + } + updateRedstoneConditions(); + } + + private void updateRedstoneConditions() { + int powerLevel = redstoneRecievers.isEmpty() ? 0 : 15; + inputRedstoneConditionMet = RedstoneControlMode.isConditionMet(inputControlMode, powerLevel); + outputRedstoneConditionMet = RedstoneControlMode.isConditionMet(outputControlMode, powerLevel); + + } + } diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/ClientNetworkManager.java b/src/main/java/crazypants/enderio/machine/capbank/network/ClientNetworkManager.java index 8393da83..bbc77899 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/network/ClientNetworkManager.java +++ b/src/main/java/crazypants/enderio/machine/capbank/network/ClientNetworkManager.java @@ -19,10 +19,9 @@ public class ClientNetworkManager { } public void destroyNetwork(int id) { - System.out.println("ClientNetworkManager.destroyNetwork: " + id); CapBankClientNetwork res = networks.get(id); if(res != null) { - res.destroy(); + res.destroyNetwork(); } } @@ -31,15 +30,15 @@ public class ClientNetworkManager { network.setState(state); } - public NetworkClientState getClientState(int id) { + public void updateEnergyStored(int id, long energyStored) { CapBankClientNetwork res = networks.get(id); if(res == null) { - return null; + return; } - return res.getState(); + res.setEnergyStored(energyStored); } - private CapBankClientNetwork getOrCreateNetwork(int id) { + public CapBankClientNetwork getOrCreateNetwork(int id) { CapBankClientNetwork res = networks.get(id); if(res == null) { res = new CapBankClientNetwork(id); @@ -51,7 +50,6 @@ public class ClientNetworkManager { public void addToNetwork(int id, TileCapBank tileCapBank) { CapBankClientNetwork network = getOrCreateNetwork(id); network.addMember(tileCapBank); - } public CapBankClientNetwork getNetwork(TileCapBank tr) { diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/ICapBankNetwork.java b/src/main/java/crazypants/enderio/machine/capbank/network/ICapBankNetwork.java new file mode 100644 index 00000000..c93d7581 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/capbank/network/ICapBankNetwork.java @@ -0,0 +1,38 @@ +package crazypants.enderio.machine.capbank.network; + +import java.util.List; + +import crazypants.enderio.machine.RedstoneControlMode; +import crazypants.enderio.machine.capbank.TileCapBank; + +public interface ICapBankNetwork { + + int getId(); + + int getMaxIO(); + + long getMaxEnergyStored(); + + long getEnergyStored(); + + int getMaxEnergySent(); + + void setMaxEnergySend(int max); + + int getMaxEnergyRecieved(); + + void setMaxEnergyReccieved(int max); + + void destroyNetwork(); + + List getMembers(); + + public abstract void setOutputControlMode(RedstoneControlMode outputControlMode); + + public abstract RedstoneControlMode getOutputControlMode(); + + public abstract void setInputControlMode(RedstoneControlMode inputControlMode); + + public abstract RedstoneControlMode getInputControlMode(); + +} diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/NetworkClientState.java b/src/main/java/crazypants/enderio/machine/capbank/network/NetworkClientState.java index 4af46b4a..d28b4d85 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/network/NetworkClientState.java +++ b/src/main/java/crazypants/enderio/machine/capbank/network/NetworkClientState.java @@ -1,6 +1,7 @@ package crazypants.enderio.machine.capbank.network; import io.netty.buffer.ByteBuf; +import crazypants.enderio.machine.RedstoneControlMode; public class NetworkClientState { @@ -9,37 +10,32 @@ public class NetworkClientState { private final int maxIO; private final int maxInput; private final int maxOutput; + private final RedstoneControlMode inputMode; + private final RedstoneControlMode outputMode; public NetworkClientState() { - this(0, 0, 0, 0, 0); + this(0, 0, 0, 0, 0, RedstoneControlMode.IGNORE, RedstoneControlMode.IGNORE); } - public NetworkClientState(long energyStored, long maxEnergyStored, int maxIO, int maxInput, int maxOutput) { + public NetworkClientState(long energyStored, long maxEnergyStored, int maxIO, int maxInput, int maxOutput, RedstoneControlMode inputMode, + RedstoneControlMode ouputMode) { this.energyStored = energyStored; this.maxEnergyStored = maxEnergyStored; this.maxIO = maxIO; this.maxInput = maxInput; this.maxOutput = maxOutput; + this.inputMode = inputMode; + outputMode = ouputMode; } - public NetworkClientState(CapBankNetwork network) { + public NetworkClientState(ICapBankNetwork network) { energyStored = network.getEnergyStored(); maxEnergyStored = network.getMaxEnergyStored(); maxIO = network.getMaxIO(); maxInput = network.getMaxEnergyRecieved(); maxOutput = network.getMaxEnergySent(); - } - - public void writeToBuf(ByteBuf buf) { - buf.writeLong(energyStored); - buf.writeLong(maxEnergyStored); - buf.writeInt(maxIO); - buf.writeInt(maxInput); - buf.writeInt(maxOutput); - } - - public static NetworkClientState readFromBuf(ByteBuf buf) { - return new NetworkClientState(buf.readLong(), buf.readLong(), buf.readInt(), buf.readInt(), buf.readInt()); + inputMode = network.getInputControlMode(); + outputMode = network.getOutputControlMode(); } public long getEnergyStored() { @@ -62,6 +58,29 @@ public class NetworkClientState { return maxIO; } + public RedstoneControlMode getInputMode() { + return inputMode; + } + + public RedstoneControlMode getOutputMode() { + return outputMode; + } + + public void writeToBuf(ByteBuf buf) { + buf.writeLong(energyStored); + buf.writeLong(maxEnergyStored); + buf.writeInt(maxIO); + buf.writeInt(maxInput); + buf.writeInt(maxOutput); + buf.writeShort(inputMode.ordinal()); + buf.writeShort(outputMode.ordinal()); + } + + public static NetworkClientState readFromBuf(ByteBuf buf) { + return new NetworkClientState(buf.readLong(), buf.readLong(), buf.readInt(), buf.readInt(), buf.readInt(), + RedstoneControlMode.values()[buf.readShort()], RedstoneControlMode.values()[buf.readShort()]); + } + @Override public String toString() { return "NetworkClientState [energyStored=" + energyStored + ", maxEnergyStored=" + maxEnergyStored + ", maxIO=" + maxIO + ", maxInput=" + maxInput diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/NetworkUtil.java b/src/main/java/crazypants/enderio/machine/capbank/network/NetworkUtil.java index 575e638a..0fe8dfbf 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/network/NetworkUtil.java +++ b/src/main/java/crazypants/enderio/machine/capbank/network/NetworkUtil.java @@ -60,7 +60,7 @@ public class NetworkUtil { } if(cap.setNetwork(network)) { network.addCapBank(cap); - network.notifyNetworkOfUpdate(); + //network.notifyNetworkOfUpdate(); return true; } return false; diff --git a/src/main/java/crazypants/enderio/machine/capbank/packet/PacketCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/packet/PacketCapBank.java new file mode 100644 index 00000000..1210be18 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/capbank/packet/PacketCapBank.java @@ -0,0 +1,78 @@ +package crazypants.enderio.machine.capbank.packet; + +import io.netty.buffer.ByteBuf; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import cpw.mods.fml.relauncher.Side; +import crazypants.enderio.EnderIO; +import crazypants.enderio.machine.capbank.TileCapBank; + +public abstract class PacketCapBank implements IMessage, IMessageHandler { + + private int x; + private int y; + private int z; + + public PacketCapBank() { + } + + public PacketCapBank(TileCapBank capBank) { + x = capBank.xCoord; + y = capBank.yCoord; + z = capBank.zCoord; + } + + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); + } + + @Override + public void fromBytes(ByteBuf buf) { + x = buf.readInt(); + y = buf.readInt(); + z = buf.readInt(); + } + + @Override + public Q onMessage(T message, MessageContext ctx) { + + TileCapBank te = getTileEntity(message, ctx); + if(te == null) { + + return null; + } + return handleMessage(te, message, ctx); + } + + protected abstract Q handleMessage(TileCapBank te, T message, MessageContext ctx); + + protected TileCapBank getTileEntity(T message, MessageContext ctx) { + World worldObj = getWorld(ctx); + if(worldObj == null) { + return null; + } + TileEntity te = worldObj.getTileEntity(message.x, message.y, message.z); + if(te == null) { + return null; + } + if(te instanceof TileCapBank) { + return (TileCapBank) te; + } + return null; + } + + protected World getWorld(MessageContext ctx) { + if(ctx.side == Side.SERVER) { + return ctx.getServerHandler().playerEntity.worldObj; + } else { + return EnderIO.proxy.getClientWorld(); + } + } + +} diff --git a/src/main/java/crazypants/enderio/machine/capbank/packet/PacketClientStateRequest.java b/src/main/java/crazypants/enderio/machine/capbank/packet/PacketClientStateRequest.java deleted file mode 100644 index edcec8b8..00000000 --- a/src/main/java/crazypants/enderio/machine/capbank/packet/PacketClientStateRequest.java +++ /dev/null @@ -1,49 +0,0 @@ -package crazypants.enderio.machine.capbank.packet; - -import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import crazypants.enderio.machine.capbank.TileCapBank; - -public class PacketClientStateRequest implements IMessage, IMessageHandler { - - private int x; - private int y; - private int z; - - public PacketClientStateRequest() { - } - - public PacketClientStateRequest(TileCapBank capBank) { - x = capBank.xCoord; - y = capBank.yCoord; - z = capBank.zCoord; - } - - @Override - public void toBytes(ByteBuf buf) { - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); - } - - @Override - public void fromBytes(ByteBuf buf) { - x = buf.readInt(); - y = buf.readInt(); - z = buf.readInt(); - } - - @Override - public PacketClientStateResponse onMessage(PacketClientStateRequest message, MessageContext ctx) { - EntityPlayer player = ctx.getServerHandler().playerEntity; - TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z); - if(te instanceof TileCapBank) { - return new PacketClientStateResponse(((TileCapBank) te).getNetwork()); - } - return null; - } -} diff --git a/src/main/java/crazypants/enderio/machine/capbank/packet/PacketGuiChange.java b/src/main/java/crazypants/enderio/machine/capbank/packet/PacketGuiChange.java new file mode 100644 index 00000000..7f09a0ee --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/capbank/packet/PacketGuiChange.java @@ -0,0 +1,60 @@ +package crazypants.enderio.machine.capbank.packet; + +import io.netty.buffer.ByteBuf; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import crazypants.enderio.machine.RedstoneControlMode; +import crazypants.enderio.machine.capbank.TileCapBank; +import crazypants.enderio.machine.capbank.network.CapBankClientNetwork; +import crazypants.enderio.machine.capbank.network.ICapBankNetwork; + +public class PacketGuiChange extends PacketCapBank { + + private int maxSend; + private int maxRec; + private RedstoneControlMode inputMode; + private RedstoneControlMode outputMode; + + public PacketGuiChange() { + } + + public PacketGuiChange(TileCapBank capBank, CapBankClientNetwork network) { + super(capBank); + maxSend = network.getMaxEnergySent(); + maxRec = network.getMaxEnergyRecieved(); + inputMode = network.getInputControlMode(); + outputMode = network.getOutputControlMode(); + } + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + buf.writeInt(maxSend); + buf.writeInt(maxRec); + buf.writeShort(inputMode.ordinal()); + buf.writeShort(outputMode.ordinal()); + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + maxSend = buf.readInt(); + maxRec = buf.readInt(); + inputMode = RedstoneControlMode.values()[buf.readShort()]; + outputMode = RedstoneControlMode.values()[buf.readShort()]; + } + + @Override + protected IMessage handleMessage(TileCapBank te, PacketGuiChange message, MessageContext ctx) { + ICapBankNetwork net = te.getNetwork(); + if(net == null) { + return null; + } + net.setMaxEnergySend(message.maxSend); + net.setMaxEnergyReccieved(message.maxRec); + net.setInputControlMode(message.inputMode); + net.setOutputControlMode(message.outputMode); + return null; + } + +} diff --git a/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkEnergyRequest.java b/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkEnergyRequest.java new file mode 100644 index 00000000..db79e28d --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkEnergyRequest.java @@ -0,0 +1,23 @@ +package crazypants.enderio.machine.capbank.packet; + +import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import crazypants.enderio.machine.capbank.TileCapBank; + +public class PacketNetworkEnergyRequest extends PacketCapBank { + + public PacketNetworkEnergyRequest() { + } + + public PacketNetworkEnergyRequest(TileCapBank capBank) { + super(capBank); + } + + @Override + protected PacketNetworkEnergyResponse handleMessage(TileCapBank te, PacketNetworkEnergyRequest message, MessageContext ctx) { + if(te.getNetwork() != null) { + return new PacketNetworkEnergyResponse(te.getNetwork()); + } + return null; + } + +} diff --git a/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkEnergyResponse.java b/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkEnergyResponse.java new file mode 100644 index 00000000..7d5ee2c3 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkEnergyResponse.java @@ -0,0 +1,41 @@ +package crazypants.enderio.machine.capbank.packet; + +import io.netty.buffer.ByteBuf; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import crazypants.enderio.machine.capbank.network.ClientNetworkManager; +import crazypants.enderio.machine.capbank.network.ICapBankNetwork; + +public class PacketNetworkEnergyResponse implements IMessage, IMessageHandler { + + private int id; + private long energyStored; + + public PacketNetworkEnergyResponse() { + } + + public PacketNetworkEnergyResponse(ICapBankNetwork network) { + id = network.getId(); + energyStored = network.getEnergyStored(); + } + + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(id); + buf.writeLong(energyStored); + } + + @Override + public void fromBytes(ByteBuf buf) { + id = buf.readInt(); + energyStored = buf.readLong(); + } + + @Override + public IMessage onMessage(PacketNetworkEnergyResponse message, MessageContext ctx) { + ClientNetworkManager.getInstance().updateEnergyStored(message.id, message.energyStored); + return null; + } + +} diff --git a/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkIdRequest.java b/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkIdRequest.java index dda32d9f..420dc483 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkIdRequest.java +++ b/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkIdRequest.java @@ -1,58 +1,23 @@ package crazypants.enderio.machine.capbank.packet; -import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.machine.capbank.TileCapBank; -public class PacketNetworkIdRequest implements IMessage, IMessageHandler { - - private int x; - private int y; - private int z; +public class PacketNetworkIdRequest extends PacketCapBank { public PacketNetworkIdRequest() { } public PacketNetworkIdRequest(TileCapBank capBank) { - x = capBank.xCoord; - y = capBank.yCoord; - z = capBank.zCoord; + super(capBank); } @Override - public void toBytes(ByteBuf buf) { - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); - } - - @Override - public void fromBytes(ByteBuf buf) { - x = buf.readInt(); - y = buf.readInt(); - z = buf.readInt(); - } - - @Override - public PacketNetworkIdResponse onMessage(PacketNetworkIdRequest message, MessageContext ctx) { - EntityPlayer player = ctx.getServerHandler().playerEntity; - TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z); - if(te instanceof TileCapBank) { - TileCapBank capBank = (TileCapBank) te; - if(capBank.getNetwork() != null) { - return new PacketNetworkIdResponse((TileCapBank) te); - } + protected PacketNetworkIdResponse handleMessage(TileCapBank te, PacketNetworkIdRequest message, MessageContext ctx) { + if(te.getNetwork() != null) { + return new PacketNetworkIdResponse(te); } return null; } - @Override - public String toString() { - return "PacketNetworkIdRequest [x=" + x + ", y=" + y + ", z=" + z + "]"; - } - } diff --git a/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkIdResponse.java b/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkIdResponse.java index cacbac49..bbf4605d 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkIdResponse.java +++ b/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkIdResponse.java @@ -1,60 +1,41 @@ package crazypants.enderio.machine.capbank.packet; import io.netty.buffer.ByteBuf; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import crazypants.enderio.EnderIO; import crazypants.enderio.machine.capbank.TileCapBank; -public class PacketNetworkIdResponse implements IMessage, IMessageHandler { +public class PacketNetworkIdResponse extends PacketCapBank { private int id; - private int x; - private int y; - private int z; - + public PacketNetworkIdResponse() { } PacketNetworkIdResponse(TileCapBank capBank) { + super(capBank); if(capBank != null && capBank.getNetwork() != null) { id = capBank.getNetwork().getId(); } else { id = -1; } - x = capBank.xCoord; - y = capBank.yCoord; - z = capBank.zCoord; } @Override public void toBytes(ByteBuf buf) { + super.toBytes(buf); buf.writeInt(id); - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); } @Override public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); id = buf.readInt(); - x = buf.readInt(); - y = buf.readInt(); - z = buf.readInt(); } @Override - public IMessage onMessage(PacketNetworkIdResponse message, MessageContext ctx) { - World w = EnderIO.proxy.getClientWorld(); - if(w != null) { - TileEntity te = w.getTileEntity(message.x, message.y, message.z); - if(te instanceof TileCapBank) { - ((TileCapBank) te).setNetworkId(message.id); - } - } + protected IMessage handleMessage(TileCapBank te, PacketNetworkIdResponse message, MessageContext ctx) { + te.setNetworkId(message.id); return null; } diff --git a/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkStateRequest.java b/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkStateRequest.java new file mode 100644 index 00000000..e6f8628b --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkStateRequest.java @@ -0,0 +1,20 @@ +package crazypants.enderio.machine.capbank.packet; + +import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import crazypants.enderio.machine.capbank.TileCapBank; + +public class PacketNetworkStateRequest extends PacketCapBank { + + public PacketNetworkStateRequest() { + } + + public PacketNetworkStateRequest(TileCapBank capBank) { + super(capBank); + } + + @Override + protected PacketNetworkStateResponse handleMessage(TileCapBank te, PacketNetworkStateRequest message, MessageContext ctx) { + return new PacketNetworkStateResponse(te.getNetwork()); + } + +} diff --git a/src/main/java/crazypants/enderio/machine/capbank/packet/PacketClientStateResponse.java b/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkStateResponse.java similarity index 77% rename from src/main/java/crazypants/enderio/machine/capbank/packet/PacketClientStateResponse.java rename to src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkStateResponse.java index b39b88f3..da4ec332 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/packet/PacketClientStateResponse.java +++ b/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkStateResponse.java @@ -8,19 +8,19 @@ import crazypants.enderio.machine.capbank.network.CapBankNetwork; import crazypants.enderio.machine.capbank.network.ClientNetworkManager; import crazypants.enderio.machine.capbank.network.NetworkClientState; -public class PacketClientStateResponse implements IMessage, IMessageHandler { +public class PacketNetworkStateResponse implements IMessage, IMessageHandler { private int id; private NetworkClientState state; - public PacketClientStateResponse() { + public PacketNetworkStateResponse() { } - public PacketClientStateResponse(CapBankNetwork network) { + public PacketNetworkStateResponse(CapBankNetwork network) { this(network, false); } - public PacketClientStateResponse(CapBankNetwork network, boolean remove) { + public PacketNetworkStateResponse(CapBankNetwork network, boolean remove) { id = network.getId(); if(!remove) { state = network.getClientState(); @@ -50,7 +50,7 @@ public class PacketClientStateResponse implements IMessage, IMessageHandler Date: Wed, 3 Dec 2014 20:06:06 +0800 Subject: [PATCH 04/12] Now sending power. --- .../enderio/machine/capbank/GuiCapBank.java | 4 +- .../enderio/machine/capbank/TileCapBank.java | 53 ++++++-- .../capbank/network/CapBankClientNetwork.java | 2 +- .../capbank/network/CapBankNetwork.java | 128 ++++++++++++++++-- .../capbank/network/ClientNetworkManager.java | 2 +- .../capbank/network/EnergyReceptor.java | 90 ++++++++++++ ...workClientState.java => NetworkState.java} | 12 +- .../packet/PacketNetworkStateResponse.java | 6 +- 8 files changed, 267 insertions(+), 30 deletions(-) create mode 100644 src/main/java/crazypants/enderio/machine/capbank/network/EnergyReceptor.java rename src/main/java/crazypants/enderio/machine/capbank/network/{NetworkClientState.java => NetworkState.java} (83%) diff --git a/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java index 187437e7..0056c8b2 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java @@ -24,7 +24,7 @@ import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.machine.capbank.network.CapBankClientNetwork; import crazypants.enderio.machine.capbank.network.ClientNetworkManager; -import crazypants.enderio.machine.capbank.network.NetworkClientState; +import crazypants.enderio.machine.capbank.network.NetworkState; import crazypants.enderio.machine.capbank.packet.PacketGuiChange; import crazypants.enderio.machine.capbank.packet.PacketNetworkEnergyRequest; import crazypants.enderio.machine.capbank.packet.PacketNetworkStateRequest; @@ -39,7 +39,7 @@ import crazypants.vecmath.VecmathUtil; public class GuiCapBank extends GuiContainerBase { - private static final NetworkClientState EMPTY_STATE = new NetworkClientState(); + private static final NetworkState EMPTY_STATE = new NetworkState(); private static final CapBankClientNetwork NULL_NETWORK = new CapBankClientNetwork(-1); diff --git a/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java index 4e1d1c91..e19bc8fc 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java @@ -1,6 +1,8 @@ package crazypants.enderio.machine.capbank; +import java.util.ArrayList; import java.util.EnumMap; +import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -22,6 +24,7 @@ import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.machine.capbank.network.CapBankNetwork; import crazypants.enderio.machine.capbank.network.ClientNetworkManager; +import crazypants.enderio.machine.capbank.network.EnergyReceptor; import crazypants.enderio.machine.capbank.network.NetworkUtil; import crazypants.enderio.machine.capbank.packet.PacketNetworkIdRequest; import crazypants.enderio.network.PacketHandler; @@ -46,6 +49,9 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor private boolean redstoneStateDirty = true; private boolean isRecievingRedstoneSignal; + private final List receptors = new ArrayList(); + private boolean receptorsDirty = true; + private CapBankNetwork network; //Client side refernce to look up network state @@ -66,6 +72,7 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor public void onNeighborBlockChange(Block blockId) { redstoneStateDirty = true; + receptorsDirty = true; } //---------- Multiblock @@ -136,6 +143,10 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor network.updateRedstoneSignal(this, recievingSignal); redstoneStateDirty = false; } + + if(receptorsDirty) { + updateReceptors(); + } } private void updateNetwork(World world) { @@ -194,15 +205,9 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor faceModes = new EnumMap(ForgeDirection.class); } faceModes.put(faceHit, mode); - - //TODO - // if(updateReceptors) { - // receptorsDirty = true; - // getController().masterReceptorsDirty = true; - // notifyNeighbours = true; - // } - // render = true; - // updateBlock(); + if(updateReceptors) { + receptorsDirty = true; + } if(worldObj != null) { worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, blockType); @@ -250,6 +255,36 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor //----------- Power + public List getReceptors() { + if(receptorsDirty) { + updateReceptors(); + } + return receptors; + } + + private void updateReceptors() { + + if(network == null) { + return; + } + network.removeReceptors(receptors); + + receptors.clear(); + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + IoMode ioMode = getIoMode(dir); + if(ioMode != IoMode.DISABLED && ioMode != IoMode.PULL) { + IPowerInterface pi = getReceptorForFace(dir); + if(pi != null) { + EnergyReceptor er = new EnergyReceptor(this, pi, dir); + receptors.add(er); + } + } + } + network.addReceptors(receptors); + + receptorsDirty = false; + } + public void addEnergy(int energy) { if(network == null) { setEnergyStored(getEnergyStored() + energy); diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/CapBankClientNetwork.java b/src/main/java/crazypants/enderio/machine/capbank/network/CapBankClientNetwork.java index db604b64..036b3644 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/network/CapBankClientNetwork.java +++ b/src/main/java/crazypants/enderio/machine/capbank/network/CapBankClientNetwork.java @@ -31,7 +31,7 @@ public class CapBankClientNetwork implements ICapBankNetwork { return id; } - public void setState(NetworkClientState state) { + public void setState(NetworkState state) { maxEnergyRecieved = state.getMaxInput(); maxEnergySent = state.getMaxOutput(); maxIO = state.getMaxIO(); diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java b/src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java index cdcf74fc..5261a73b 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java +++ b/src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java @@ -3,22 +3,34 @@ package crazypants.enderio.machine.capbank.network; import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; +import java.util.Iterator; import java.util.List; import java.util.Set; import net.minecraft.world.World; +import cpw.mods.fml.common.gameevent.TickEvent.ServerTickEvent; import crazypants.enderio.EnderIO; +import crazypants.enderio.conduit.ConduitNetworkTickHandler; +import crazypants.enderio.conduit.ConduitNetworkTickHandler.TickListener; +import crazypants.enderio.conduit.ConnectionMode; +import crazypants.enderio.conduit.power.IPowerConduit; +import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.machine.capbank.CapBankType; import crazypants.enderio.machine.capbank.TileCapBank; import crazypants.enderio.machine.capbank.packet.PacketNetworkStateResponse; +import crazypants.enderio.power.IPowerInterface; import crazypants.util.BlockCoord; +import crazypants.util.RoundRobinIterator; public class CapBankNetwork implements ICapBankNetwork { private static final int IO_CAP = 2000000000; - protected final List capBanks = new ArrayList(); + private final List capBanks = new ArrayList(); + + private final Set receptors = new HashSet(); + private RoundRobinIterator receptorIterator; private final int id; @@ -45,6 +57,7 @@ public class CapBankNetwork implements ICapBankNetwork { private boolean inputRedstoneConditionMet = true; private boolean outputRedstoneConditionMet = true; + private TickListener tickListener; public CapBankNetwork(int id) { this.id = id; @@ -57,6 +70,8 @@ public class CapBankNetwork implements ICapBankNetwork { throw new UnsupportedOperationException(); } + tickListener = new TickReciever(); + type = cap.getType(); inputControlMode = cap.getInputControlMode(); outputControlMode = cap.getOutputControlMode(); @@ -94,7 +109,7 @@ public class CapBankNetwork implements ICapBankNetwork { @Override public void destroyNetwork() { - distributeEnergy(); + distributeEnergyToBanks(); TileCapBank cap = null; for (TileCapBank cb : capBanks) { cb.setNetwork(null); @@ -132,6 +147,12 @@ public class CapBankNetwork implements ICapBankNetwork { } cap.setInputControlMode(inputControlMode); cap.setOutputControlMode(outputControlMode); + + List recs = cap.getReceptors(); + if(!recs.isEmpty()) { + addReceptors(recs); + } + } } @@ -140,8 +161,8 @@ public class CapBankNetwork implements ICapBankNetwork { return id; } - public NetworkClientState getClientState() { - return new NetworkClientState(this); + public NetworkState getClientState() { + return new NetworkState(this); } //--------- Tick Handling @@ -157,18 +178,71 @@ public class CapBankNetwork implements ICapBankNetwork { long curTime = world.getTotalWorldTime(); if(curTime != timeAtLastApply) { timeAtLastApply = curTime; - doNetworkTick(); + ConduitNetworkTickHandler.instance.addListener(tickListener); } } private void doNetworkTick() { + transmitEnergy(); + if(energyStored != prevEnergyStored) { - distributeEnergy(); + distributeEnergyToBanks(); } prevEnergyStored = energyStored; } - private void distributeEnergy() { + private void transmitEnergy() { + + if(!outputRedstoneConditionMet) { + return; + } + + if(receptors.isEmpty()) { + return; + } + + int available; + if(energyStored > getMaxEnergySent()) { + available = getMaxEnergySent(); + } else { + available = (int) energyStored; + } + if(available <= 0) { + return; + } + + if(receptorIterator == null) { + List rl = new ArrayList(receptors); + receptorIterator = new RoundRobinIterator(rl); + } + + int totalSent = 0; + Iterator iter = receptorIterator.iterator(); + while (available > 0 && iter.hasNext()) { + int sent = sendPowerTo(iter.next(), available); + totalSent += sent; + available -= sent; + } + addEnergy(-totalSent); + + } + + private int sendPowerTo(EnergyReceptor next, int available) { + //Can only send to power conduits if we are in push mode or the conduit is in pull mode + //With default setting interaction between conduits and Cap Banks is handled by NetworkPowerManager + IPowerConduit con = next.getConduit(); + if(con != null && next.getMode() == IoMode.NONE && con.getConnectionMode(next.getDir().getOpposite()) == ConnectionMode.IN_OUT) { + return 0; + } + IPowerInterface inf = next.getReceptor(); + int result = inf.recieveEnergy(next.getDir().getOpposite(), available); + if(result < 0) { + result = 0; + } + return result; + } + + private void distributeEnergyToBanks() { if(capBanks.isEmpty()) { return; } @@ -181,7 +255,7 @@ public class CapBankNetwork implements ICapBankNetwork { cb.setEnergyStored(cb.getEnergyStored() + remaining); } - //------ Power + //------ Power public int recieveEnergy(int maxReceive, boolean simulate) { if(maxReceive <= 0 || !inputRedstoneConditionMet) { @@ -209,6 +283,31 @@ public class CapBankNetwork implements ICapBankNetwork { } } + public void addEnergyReceptor(EnergyReceptor rec) { + receptors.add(rec); + receptorIterator = null; + } + + public void addReceptors(Collection rec) { + if(rec.isEmpty()) { + return; + } + receptors.addAll(rec); + receptorIterator = null; + } + + public void removeReceptors(Collection rec) { + if(rec.isEmpty()) { + return; + } + receptors.removeAll(rec); + receptorIterator = null; + } + + public void removeReceptor(EnergyReceptor rec) { + receptors.remove(rec); + receptorIterator = null; + } @Override public long getEnergyStored() { @@ -325,4 +424,17 @@ public class CapBankNetwork implements ICapBankNetwork { } + private class TickReciever implements TickListener { + + @Override + public void tickStart(ServerTickEvent evt) { + } + + @Override + public void tickEnd(ServerTickEvent evt) { + doNetworkTick(); + } + + } + } diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/ClientNetworkManager.java b/src/main/java/crazypants/enderio/machine/capbank/network/ClientNetworkManager.java index bbc77899..a461319c 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/network/ClientNetworkManager.java +++ b/src/main/java/crazypants/enderio/machine/capbank/network/ClientNetworkManager.java @@ -25,7 +25,7 @@ public class ClientNetworkManager { } } - public void updateState(int id, NetworkClientState state) { + public void updateState(int id, NetworkState state) { CapBankClientNetwork network = getOrCreateNetwork(id); network.setState(state); } diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/EnergyReceptor.java b/src/main/java/crazypants/enderio/machine/capbank/network/EnergyReceptor.java new file mode 100644 index 00000000..0b69fd6a --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/capbank/network/EnergyReceptor.java @@ -0,0 +1,90 @@ +package crazypants.enderio.machine.capbank.network; + +import net.minecraftforge.common.util.ForgeDirection; +import crazypants.enderio.conduit.IConduitBundle; +import crazypants.enderio.conduit.power.IPowerConduit; +import crazypants.enderio.machine.IoMode; +import crazypants.enderio.machine.capbank.TileCapBank; +import crazypants.enderio.power.IPowerInterface; +import crazypants.util.BlockCoord; + +public class EnergyReceptor { + + private final IPowerInterface receptor; + private final ForgeDirection fromDir; + private final IoMode mode; + private final BlockCoord location; + + private final IPowerConduit conduit; + + public EnergyReceptor(TileCapBank cb, IPowerInterface receptor, ForgeDirection dir) { + this.receptor = receptor; + fromDir = dir; + mode = cb.getIoMode(dir); + if(receptor.getDelegate() instanceof IConduitBundle) { + conduit = ((IConduitBundle) receptor.getDelegate()).getConduit(IPowerConduit.class); + } else { + conduit = null; + } + location = cb.getLocation(); + } + + public IPowerConduit getConduit() { + return conduit; + } + + public IPowerInterface getReceptor() { + return receptor; + } + + public ForgeDirection getDir() { + return fromDir; + } + + public IoMode getMode() { + return mode; + } + + //NB: Special impl of equals and hash code based solely on the location and dir + //This is done to ensure the receptors in the Networks Set are added / removed correctly + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((fromDir == null) ? 0 : fromDir.hashCode()); + result = prime * result + ((location == null) ? 0 : location.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if(this == obj) { + return true; + } + if(obj == null) { + return false; + } + if(getClass() != obj.getClass()) { + return false; + } + EnergyReceptor other = (EnergyReceptor) obj; + if(fromDir != other.fromDir) { + return false; + } + if(location == null) { + if(other.location != null) { + return false; + } + } else if(!location.equals(other.location)) { + return false; + } + return true; + } + + @Override + public String toString() { + return "EnergyReceptor [receptor=" + receptor + ", fromDir=" + fromDir + ", mode=" + mode + ", conduit=" + conduit + "]"; + } + +} diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/NetworkClientState.java b/src/main/java/crazypants/enderio/machine/capbank/network/NetworkState.java similarity index 83% rename from src/main/java/crazypants/enderio/machine/capbank/network/NetworkClientState.java rename to src/main/java/crazypants/enderio/machine/capbank/network/NetworkState.java index d28b4d85..3766e0b4 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/network/NetworkClientState.java +++ b/src/main/java/crazypants/enderio/machine/capbank/network/NetworkState.java @@ -3,7 +3,7 @@ package crazypants.enderio.machine.capbank.network; import io.netty.buffer.ByteBuf; import crazypants.enderio.machine.RedstoneControlMode; -public class NetworkClientState { +public class NetworkState { private final long energyStored; private final long maxEnergyStored; @@ -13,11 +13,11 @@ public class NetworkClientState { private final RedstoneControlMode inputMode; private final RedstoneControlMode outputMode; - public NetworkClientState() { + public NetworkState() { this(0, 0, 0, 0, 0, RedstoneControlMode.IGNORE, RedstoneControlMode.IGNORE); } - public NetworkClientState(long energyStored, long maxEnergyStored, int maxIO, int maxInput, int maxOutput, RedstoneControlMode inputMode, + public NetworkState(long energyStored, long maxEnergyStored, int maxIO, int maxInput, int maxOutput, RedstoneControlMode inputMode, RedstoneControlMode ouputMode) { this.energyStored = energyStored; this.maxEnergyStored = maxEnergyStored; @@ -28,7 +28,7 @@ public class NetworkClientState { outputMode = ouputMode; } - public NetworkClientState(ICapBankNetwork network) { + public NetworkState(ICapBankNetwork network) { energyStored = network.getEnergyStored(); maxEnergyStored = network.getMaxEnergyStored(); maxIO = network.getMaxIO(); @@ -76,8 +76,8 @@ public class NetworkClientState { buf.writeShort(outputMode.ordinal()); } - public static NetworkClientState readFromBuf(ByteBuf buf) { - return new NetworkClientState(buf.readLong(), buf.readLong(), buf.readInt(), buf.readInt(), buf.readInt(), + public static NetworkState readFromBuf(ByteBuf buf) { + return new NetworkState(buf.readLong(), buf.readLong(), buf.readInt(), buf.readInt(), buf.readInt(), RedstoneControlMode.values()[buf.readShort()], RedstoneControlMode.values()[buf.readShort()]); } diff --git a/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkStateResponse.java b/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkStateResponse.java index da4ec332..d3d522af 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkStateResponse.java +++ b/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkStateResponse.java @@ -6,12 +6,12 @@ import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.machine.capbank.network.CapBankNetwork; import crazypants.enderio.machine.capbank.network.ClientNetworkManager; -import crazypants.enderio.machine.capbank.network.NetworkClientState; +import crazypants.enderio.machine.capbank.network.NetworkState; public class PacketNetworkStateResponse implements IMessage, IMessageHandler { private int id; - private NetworkClientState state; + private NetworkState state; public PacketNetworkStateResponse() { } @@ -43,7 +43,7 @@ public class PacketNetworkStateResponse implements IMessage, IMessageHandler Date: Thu, 4 Dec 2014 14:23:23 +0800 Subject: [PATCH 05/12] Inventory, WAILA and item state done. --- resources/assets/enderio/lang/en_US.lang | 1 + .../conduit/power/NetworkPowerManager.java | 32 +-- .../enderio/conduit/power/PowerTracker.java | 69 +----- .../enderio/item/PacketConduitProbe.java | 4 +- .../machine/AbstractMachineEntity.java | 4 +- .../enderio/machine/capbank/BlockCapBank.java | 219 +++++++++++------- .../machine/capbank/BlockItemCapBank.java | 2 + .../enderio/machine/capbank/CapBankType.java | 12 + .../machine/capbank/ContainerCapBank.java | 166 ++++++++++++- .../enderio/machine/capbank/GuiCapBank.java | 12 +- .../enderio/machine/capbank/TileCapBank.java | 196 +++++++++++++--- .../capbank/network/CapBankClientNetwork.java | 70 +++++- .../capbank/network/CapBankNetwork.java | 112 +++++++-- .../capbank/network/ClientNetworkManager.java | 16 +- .../capbank/network/ICapBankNetwork.java | 50 +++- .../capbank/network/InventoryImpl.java | 157 +++++++++++++ .../machine/capbank/network/NetworkState.java | 35 ++- .../machine/capbank/network/NetworkUtil.java | 4 +- .../capbank/packet/PacketGuiChange.java | 4 +- .../packet/PacketNetworkEnergyResponse.java | 6 +- .../packet/PacketNetworkIdResponse.java | 2 + .../packet/PacketNetworkStateResponse.java | 11 +- ...nectionRF.java => EnergyConnectionPI.java} | 14 +- .../enderio/power/EnergyHandlerPI.java | 18 ++ ...InterfaceRF.java => EnergyReceiverPI.java} | 20 +- .../enderio/power/IPowerInterface.java | 4 + .../power/PerTickIntAverageCalculator.java | 59 +++++ .../enderio/power/PowerHandlerUtil.java | 13 +- .../enderio/waila/IWailaInfoProvider.java | 3 +- .../crazypants/enderio/waila/WailaCompat.java | 9 +- src/main/java/crazypants/util/BlockCoord.java | 29 ++- src/main/java/crazypants/util/Util.java | 31 ++- 32 files changed, 1082 insertions(+), 302 deletions(-) create mode 100644 src/main/java/crazypants/enderio/machine/capbank/network/InventoryImpl.java rename src/main/java/crazypants/enderio/power/{PowerInterfaceConnectionRF.java => EnergyConnectionPI.java} (78%) create mode 100644 src/main/java/crazypants/enderio/power/EnergyHandlerPI.java rename src/main/java/crazypants/enderio/power/{PowerInterfaceRF.java => EnergyReceiverPI.java} (82%) create mode 100644 src/main/java/crazypants/enderio/power/PerTickIntAverageCalculator.java diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 11d005ec..b410aeb0 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -270,6 +270,7 @@ tile.blockCapBank.tooltipPrefix=Contains enderio.capbank.maxIO=Max I/O enderio.capbank.maxIn=Max Input enderio.capbank.maxOut=Max Output +enderio.capbank.change=I/O tile.blockWirelessCharger.name=Wireless Charger tile.blockWirelessCharger.tooltip.detailed.line1=Charges items in nearby diff --git a/src/main/java/crazypants/enderio/conduit/power/NetworkPowerManager.java b/src/main/java/crazypants/enderio/conduit/power/NetworkPowerManager.java index 88741035..089aeb70 100644 --- a/src/main/java/crazypants/enderio/conduit/power/NetworkPowerManager.java +++ b/src/main/java/crazypants/enderio/conduit/power/NetworkPowerManager.java @@ -20,8 +20,6 @@ import crazypants.enderio.conduit.power.PowerConduitNetwork.ReceptorEntry; import crazypants.enderio.config.Config; import crazypants.enderio.machine.power.TileCapacitorBank; import crazypants.enderio.power.IPowerInterface; -import crazypants.enderio.power.PowerInterfaceRF; -import crazypants.util.BlockCoord; public class NetworkPowerManager { @@ -41,9 +39,6 @@ public class NetworkPowerManager { private boolean receptorsDirty = true; - private boolean lastActiveValue = false; - private int ticksWithNoPower = 0; - private final Map powerTrackers = new HashMap(); private PowerTracker networkPowerTracker = new PowerTracker(); @@ -53,7 +48,7 @@ public class NetworkPowerManager { private InnerTickHandler applyPowerCallback = new InnerTickHandler(); public NetworkPowerManager(PowerConduitNetwork netowrk, World world) { - this.network = netowrk; + network = netowrk; maxEnergyStored = 64; } @@ -132,8 +127,6 @@ public class NetworkPowerManager { updateNetorkStorage(); networkPowerTracker.tickStart(energyStored); - updateActiveState(); - capSupply.init(); int appliedCount = 0; @@ -252,25 +245,6 @@ public class NetworkPowerManager { return result; } - private void updateActiveState() { - boolean active; - if(energyStored > 0) { - ticksWithNoPower = 0; - active = true; - } else { - ticksWithNoPower++; - active = false; - } - - boolean doRender = active != lastActiveValue && (active || (!active && ticksWithNoPower > updateRenderTicks)); - if(doRender) { - lastActiveValue = active; - //for (IPowerConduit con : network.getConduits()) { - //con.setActive(active); - //} - } - } - private void distributeStorageToConduits() { if(maxEnergyStored <= 0 || energyStored <= 0) { for (IPowerConduit con : network.getConduits()) { @@ -424,7 +398,7 @@ public class NetworkPowerManager { filledRatio = 0; if(maxToBalance > 0) { - filledRatio = (float) toBalance / maxToBalance; + filledRatio = toBalance / maxToBalance; } } @@ -522,7 +496,7 @@ public class NetworkPowerManager { private CapBankSupplyEntry(TileCapacitorBank capBank, int available, int canFill, IPowerConduit emmiter, ForgeDirection direction) { this.capBank = capBank; - this.canExtract = available; + canExtract = available; this.canFill = canFill; this.emmiter = emmiter; this.direction = direction; diff --git a/src/main/java/crazypants/enderio/conduit/power/PowerTracker.java b/src/main/java/crazypants/enderio/conduit/power/PowerTracker.java index f7be04ca..e039996c 100644 --- a/src/main/java/crazypants/enderio/conduit/power/PowerTracker.java +++ b/src/main/java/crazypants/enderio/conduit/power/PowerTracker.java @@ -1,24 +1,25 @@ package crazypants.enderio.conduit.power; -import java.util.LinkedList; +import crazypants.enderio.power.PerTickIntAverageCalculator; + public class PowerTracker { - private float previousStorageLevel = -1; + private long previousStorageLevel = -1; - private final TickTracker recTracker = new TickTracker(); + private final PerTickIntAverageCalculator recTracker = new PerTickIntAverageCalculator(); - private final TickTracker sentTracker = new TickTracker(); + private final PerTickIntAverageCalculator sentTracker = new PerTickIntAverageCalculator(); private int sentThisTick = 0; private int recievedThisTick = 0; - public void tickStart(float storedEnergy) { - double curStorage = storedEnergy; + public void tickStart(long storedEnergy) { + long curStorage = storedEnergy; if(previousStorageLevel > -1) { - double recieved = curStorage - previousStorageLevel; + long recieved = curStorage - previousStorageLevel; recieved = Math.max(0, recieved); recievedThisTick += recieved; } @@ -32,7 +33,7 @@ public class PowerTracker { sentThisTick += power; } - public void tickEnd(int storedEnergy) { + public void tickEnd(long storedEnergy) { previousStorageLevel = storedEnergy; sentTracker.tick(sentThisTick); recTracker.tick(recievedThisTick); @@ -41,59 +42,11 @@ public class PowerTracker { } public float getAverageRfTickRecieved() { - return recTracker.getRFT(); + return recTracker.getAverage(); } public float getAverageRfTickSent() { - return sentTracker.getRFT(); - } - - private static class TickTracker { - - private float lastSecondTotal = 0; - private int index = 0; - private LimitedQueue lastFiveSeconds = new LimitedQueue(5); - - float getRFT() { - int numTicks = index + (lastFiveSeconds.size() * 20); - if(numTicks == 0) { - return 0; - } - float totalPower = lastSecondTotal; - for (Float fl : lastFiveSeconds) { - totalPower += fl; - } - return totalPower / numTicks; - } - - void tick(int power) { - lastSecondTotal += power; - index++; - if(index == 20) { - lastFiveSeconds.add(lastSecondTotal); - lastSecondTotal = 0; - index = 0; - } - } - - } - - private static class LimitedQueue extends LinkedList { - - private final int limit; - - public LimitedQueue(int limit) { - this.limit = limit; - } - - @Override - public boolean add(E o) { - super.add(o); - while (size() > limit) { - super.remove(); - } - return true; - } + return sentTracker.getAverage(); } } diff --git a/src/main/java/crazypants/enderio/item/PacketConduitProbe.java b/src/main/java/crazypants/enderio/item/PacketConduitProbe.java index f3b5acbc..c2905d64 100644 --- a/src/main/java/crazypants/enderio/item/PacketConduitProbe.java +++ b/src/main/java/crazypants/enderio/item/PacketConduitProbe.java @@ -25,7 +25,7 @@ import crazypants.enderio.conduit.power.PowerConduitNetwork; import crazypants.enderio.conduit.power.PowerTracker; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.power.IInternalPowerReceptor; -import crazypants.enderio.power.PowerInterfaceRF; +import crazypants.enderio.power.EnergyHandlerPI; import crazypants.util.Lang; public class PacketConduitProbe implements IMessage, IMessageHandler { @@ -120,7 +120,7 @@ public class PacketConduitProbe implements IMessage, IMessageHandler getDrops(World world, int x, int y, int z, int metadata, int fortune) { - ArrayList ret = new ArrayList(); - // if(!world.isRemote) { - // TileEntity te = world.getTileEntity(x, y, z); - // if(te instanceof TileCapBank) { - // TileCapBank cb = (TileCapBank) te; - // cb.onBreakBlock(); - // - // ItemStack itemStack = - // BlockItemCapacitorBank.createItemStackWithPower(cb.doGetEnergyStored()); - // ret.add(itemStack); - // } - // } - return ret; + public int quantityDropped(Random r) { + return 0; } - @Override - public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) { - if(!world.isRemote) { - // TileEntity te = world.getTileEntity(x, y, z); - // if(te instanceof TileCapBank) { - // TileCapBank cb = (TileCapBank) te; - // cb.onBreakBlock(); - // - // // If we are not in Creative or blockCapBankAllwaysDrop is set to true, allow the item drop. - // // This option allows creative players to pick up broken capacitor banks - // - // if(!player.capabilities.isCreativeMode || "true".equalsIgnoreCase(System.getProperty("blockCapBankAllwaysDrop"))) { - // ItemStack itemStack = - // BlockItemCapacitorBank.createItemStackWithPower(cb.doGetEnergyStored()); - // if(cb.isCreative()) { - // itemStack.setItemDamage(1); - // } - // 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); - // } - // } - } - return super.removedByPlayer(world, player, x, y, z); - } + // @Override + // public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { + // if(world.isRemote) { + // return; + // } + // TileEntity te = world.getTileEntity(x, y, z); + // if(!(te instanceof TileCapBank)) { + // return; + // } + // + // TileCapBank cb = (TileCapBank) te; + // cb.addEnergy(PowerHandlerUtil.getStoredEnergyForItem(stack)); + // + // world.markBlockForUpdate(x, y, z); + // } @Override public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { - if(world.isRemote) { - return; - } + super.onBlockPlacedBy(world, x, y, z, player, stack); + TileEntity te = world.getTileEntity(x, y, z); if(!(te instanceof TileCapBank)) { return; } TileCapBank cb = (TileCapBank) te; - cb.addEnergy(PowerHandlerUtil.getStoredEnergyForItem(stack)); - + if(stack.stackTagCompound != null) { + cb.readCommonNBT(stack.stackTagCompound); + } + if(world.isRemote) { + return; + } world.markBlockForUpdate(x, y, z); } @Override - public int quantityDropped(Random r) { - return 0; + public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { + ArrayList ret = new ArrayList(); + if(!world.isRemote) { + TileEntity te = world.getTileEntity(x, y, z); + if(te instanceof TileCapBank) { + TileCapBank cb = (TileCapBank) te; + ret.add(createItemStack(world, x, y, z, cb)); + } + } + return ret; + } + + @Override + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) { + if(!world.isRemote && (!player.capabilities.isCreativeMode)) { + TileEntity te = world.getTileEntity(x, y, z); + if(te instanceof TileCapBank) { + TileCapBank cb = (TileCapBank) te; + cb.moveInventoryToNetwork(); + + ItemStack itemStack = createItemStack(world, x, y, z, cb); + + //Clear in the inventory as its now in the item stack + for (int i = 0; i < cb.getInventory().length; i++) { + cb.getInventory()[i] = 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); + } + } + return super.removedByPlayer(world, player, x, y, z); + } + + protected ItemStack createItemStack(World world, int x, int y, int z, TileCapBank cb) { + int meta = damageDropped(world.getBlockMetadata(x, y, z)); + ItemStack itemStack = new ItemStack(this, 1, meta); + itemStack.stackTagCompound = new NBTTagCompound(); + cb.writeCommonNBT(itemStack.stackTagCompound); + return itemStack; } @Override public void breakBlock(World world, int x, int y, int z, Block par5, int par6) { - if(!world.isRemote && world.getGameRules().getGameRuleBooleanValue("doTileDrops")) { - // TileEntity te = world.getTileEntity(x, y, z); - // if(!(te instanceof TileCapacitorBank)) { - // super.breakBlock(world, x, y, z, par5, par6); - // return; - // } - // TileCapacitorBank cb = (TileCapacitorBank) te; - // Util.dropItems(world, cb, x, y, z, true); + if(!world.isRemote) { + TileEntity te = world.getTileEntity(x, y, z); + if(!(te instanceof TileCapBank)) { + super.breakBlock(world, x, y, z, par5, par6); + return; + } + TileCapBank cb = (TileCapBank) te; + cb.onBreakBlock(); + if(world.getGameRules().getGameRuleBooleanValue("doTileDrops")) { + Util.dropItems(world, cb.getInventory(), x, y, z, true); + } } world.removeTileEntity(x, y, z); } @@ -395,7 +407,7 @@ public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTool return super.getSelectedBoundingBoxFromPool(world, x, y, z); } TileCapBank tr = (TileCapBank) te; - CapBankClientNetwork network = ClientNetworkManager.getInstance().getNetwork(tr); + ICapBankNetwork network = tr.getNetwork(); if(!tr.getType().isMultiblock() || network == null) { return super.getSelectedBoundingBoxFromPool(world, x, y, z); @@ -430,15 +442,48 @@ public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTool @Override public void getWailaInfo(List tooltip, EntityPlayer player, World world, int x, int y, int z) { - // TileEntity te = world.getTileEntity(x, y, z); - // if (te instanceof TileCapBank) { - // TileCapBank cap = (TileCapBank) te; - // String format = Util.TAB + Util.ALIGNRIGHT + EnumChatFormatting.WHITE; - // - // tooltip.add(String.format("%s : %s%s%sRF/t ", Lang.localize("capbank.maxIO"), format, fmt.format(cap.getMaxIO()), Util.TAB + Util.ALIGNRIGHT)); - // tooltip.add(String.format("%s : %s%s%sRF/t ", Lang.localize("capbank.maxIn"), format, fmt.format(cap.getMaxInput()), Util.TAB + Util.ALIGNRIGHT)); - // tooltip.add(String.format("%s : %s%s%sRF/t ", Lang.localize("capbank.maxOut"), format, fmt.format(cap.getMaxOutput()), Util.TAB + Util.ALIGNRIGHT)); - // } + TileEntity te = world.getTileEntity(x, y, z); + if(te instanceof TileCapBank) { + TileCapBank cap = (TileCapBank) te; + if(cap.getNetwork() != null) { + if(world.isRemote && world.getTotalWorldTime() % 20 == 0) { + PacketHandler.INSTANCE.sendToServer(new PacketNetworkStateRequest(cap)); + } else if(world.isRemote && world.getTotalWorldTime() % 2 == 0) { + PacketHandler.INSTANCE.sendToServer(new PacketNetworkEnergyRequest(cap)); + } + ICapBankNetwork nw = cap.getNetwork(); + + String format = Util.TAB + Util.ALIGNRIGHT + EnumChatFormatting.WHITE; + if(TooltipAddera.showAdvancedTooltips()) { + tooltip.add(String.format("%s : %s%s%sRF/t ", Lang.localize("capbank.maxIO"), format, fmt.format(nw.getMaxIO()), Util.TAB + Util.ALIGNRIGHT)); + tooltip + .add(String.format("%s : %s%s%sRF/t ", Lang.localize("capbank.maxIn"), format, fmt.format(nw.getMaxEnergyRecieved()), Util.TAB + Util.ALIGNRIGHT)); + tooltip + .add(String.format("%s : %s%s%sRF/t ", Lang.localize("capbank.maxOut"), format, fmt.format(nw.getMaxEnergySent()), Util.TAB + Util.ALIGNRIGHT)); + + tooltip.add(""); + } + + long stored = nw.getEnergyStored(); + long max = nw.getMaxEnergyStored(); + tooltip.add(String.format("%s%s%s / %s%s%s RF", EnumChatFormatting.WHITE, fmt.format(stored), EnumChatFormatting.RESET, EnumChatFormatting.WHITE, + fmt.format(max), + EnumChatFormatting.RESET)); + + float change = nw.getAverageChangePerTick(); + String color = EnumChatFormatting.WHITE.toString(); + if(change > 0) { + color = EnumChatFormatting.GREEN.toString() + "+"; + } else if(change < 0) { + color = EnumChatFormatting.RED.toString(); + } + tooltip + .add(String.format("%s%s%sRF/t ", color, fmt.format(change), " " + EnumChatFormatting.RESET.toString())); + + + + } + } } @Override diff --git a/src/main/java/crazypants/enderio/machine/capbank/BlockItemCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/BlockItemCapBank.java index e64f5a86..4aa4ef68 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/BlockItemCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/BlockItemCapBank.java @@ -13,6 +13,8 @@ public class BlockItemCapBank extends ItemBlock implements IEnergyContainerItem public static ItemStack createItemStackWithPower(int meta, int storedEnergy) { ItemStack res = new ItemStack(EnderIO.blockCapBank, 1, meta); PowerHandlerUtil.setStoredEnergyForItem(res, storedEnergy); + CapBankType type = CapBankType.getTypeFromMeta(meta); + type.writeTypeToNBT(res.stackTagCompound); return res; } diff --git a/src/main/java/crazypants/enderio/machine/capbank/CapBankType.java b/src/main/java/crazypants/enderio/machine/capbank/CapBankType.java index 2f442a33..98663623 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/CapBankType.java +++ b/src/main/java/crazypants/enderio/machine/capbank/CapBankType.java @@ -3,6 +3,7 @@ package crazypants.enderio.machine.capbank; import java.util.ArrayList; import java.util.List; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MathHelper; import crazypants.enderio.config.Config; @@ -117,4 +118,15 @@ public class CapBankType { return uid; } + public void writeTypeToNBT(NBTTagCompound nbtRoot) { + nbtRoot.setString("type", getUid()); + } + + public static CapBankType readTypeFromNBT(NBTTagCompound nbtRoot) { + if(nbtRoot == null || !nbtRoot.hasKey("type")) { + return BASIC; + } + return getTypeFromUID(nbtRoot.getString("type")); + } + } diff --git a/src/main/java/crazypants/enderio/machine/capbank/ContainerCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/ContainerCapBank.java index 40b36b7b..c4a6e8d6 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/ContainerCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/ContainerCapBank.java @@ -4,10 +4,99 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.machine.capbank.network.InventoryImpl; public class ContainerCapBank extends Container { - public ContainerCapBank(Entity player, InventoryPlayer inventory, TileCapBank cb) { + private final TileCapBank tileEntity; + private final InventoryImpl inv; + + public ContainerCapBank(final Entity player, InventoryPlayer playerInv, TileCapBank cb) { + tileEntity = cb; + if(tileEntity.getNetwork() != null && tileEntity.getNetwork().getInventory() != null) { + inv = cb.getNetwork().getInventory(); + } else { + inv = new InventoryImpl(); + } + + int armorOffset = 21; + addSlotToContainer(new Slot(inv, 0, 59 + armorOffset, 59) { + @Override + public boolean isItemValid(ItemStack itemStack) { + return inv.isItemValidForSlot(0, itemStack); + } + }); + + addSlotToContainer(new Slot(inv, 1, 79 + armorOffset, 59) { + @Override + public boolean isItemValid(ItemStack itemStack) { + return inv.isItemValidForSlot(1, itemStack); + } + }); + + addSlotToContainer(new Slot(inv, 2, 99 + armorOffset, 59) { + @Override + public boolean isItemValid(ItemStack itemStack) { + return inv.isItemValidForSlot(2, itemStack); + } + }); + + addSlotToContainer(new Slot(inv, 3, 119 + armorOffset, 59) { + @Override + public boolean isItemValid(ItemStack itemStack) { + return inv.isItemValidForSlot(3, itemStack); + } + }); + + // add players inventory + for (int i = 0; i < 3; ++i) { + for (int j = 0; j < 9; ++j) { + addSlotToContainer(new Slot(playerInv, j + i * 9 + 9, +armorOffset + 8 + j * 18, 84 + i * 18)); + } + } + + for (int i = 0; i < 9; ++i) { + addSlotToContainer(new Slot(playerInv, i, +armorOffset + 8 + i * 18, 142)); + } + + //armor slots + for (int i = 0; i < 4; ++i) { + final int k = i; + addSlotToContainer(new Slot(playerInv, playerInv.getSizeInventory() - 1 - i, -15 + armorOffset, 30 + i * 18) { + + @Override + public int getSlotStackLimit() { + return 1; + } + + @Override + public boolean isItemValid(ItemStack par1ItemStack) { + if(par1ItemStack == null) { + return false; + } + return par1ItemStack.getItem().isValidArmor(par1ItemStack, k, player); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getBackgroundIconIndex() { + return ItemArmor.func_94602_b(k); + } + }); + } + + } + + public void updateInventory() { + if(tileEntity.getNetwork() != null && tileEntity.getNetwork().getInventory() != null) { + inv.setCapBank(tileEntity.getNetwork().getInventory().getCapBank()); + } } @Override @@ -15,4 +104,79 @@ public class ContainerCapBank extends Container { return true; } + @Override + public ItemStack transferStackInSlot(EntityPlayer entityPlayer, int slotIndex) { + + int startPlayerSlot = 4; + int endPlayerSlot = startPlayerSlot + 26; + int startHotBarSlot = endPlayerSlot + 1; + int endHotBarSlot = startHotBarSlot + 9; + + ItemStack copystack = null; + Slot slot = (Slot) inventorySlots.get(slotIndex); + if(slot != null && slot.getHasStack()) { + + ItemStack origStack = slot.getStack(); + copystack = origStack.copy(); + + if(slotIndex < 4) { + // merge from machine input slots to inventory + if(!mergeItemStackIntoArmor(entityPlayer, origStack, slotIndex)) { + if(!mergeItemStack(origStack, startPlayerSlot, endHotBarSlot, false)) { + return null; + } + } + + } else { + //Check from inv-> charge then inv->hotbar or hotbar->inv + if(slotIndex >= startPlayerSlot) { + if(!inv.isItemValidForSlot(0, origStack) || !mergeItemStack(origStack, 0, 4, false)) { + + if(slotIndex <= endPlayerSlot) { + if(!mergeItemStack(origStack, startHotBarSlot, endHotBarSlot, false)) { + return null; + } + } else if(slotIndex >= startHotBarSlot && slotIndex <= endHotBarSlot) { + if(!mergeItemStack(origStack, startPlayerSlot, endPlayerSlot, false)) { + return null; + } + } + + } + } + } + + if(origStack.stackSize == 0) { + slot.putStack((ItemStack) null); + } else { + slot.onSlotChanged(); + } + + slot.onSlotChanged(); + + if(origStack.stackSize == copystack.stackSize) { + return null; + } + + slot.onPickupFromSlot(entityPlayer, origStack); + } + + return copystack; + } + + private boolean mergeItemStackIntoArmor(EntityPlayer entityPlayer, ItemStack origStack, int slotIndex) { + if(origStack == null || !(origStack.getItem() instanceof ItemArmor)) { + return false; + } + ItemArmor armor = (ItemArmor) origStack.getItem(); + int index = 3 - armor.armorType; + ItemStack[] ai = entityPlayer.inventory.armorInventory; + if(ai[index] == null) { + ai[index] = origStack.copy(); + origStack.stackSize = 0; + return true; + } + return false; + } + } diff --git a/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java index 0056c8b2..cf77c2c0 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java @@ -23,7 +23,6 @@ import crazypants.enderio.machine.IRedstoneModeControlable; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.machine.capbank.network.CapBankClientNetwork; -import crazypants.enderio.machine.capbank.network.ClientNetworkManager; import crazypants.enderio.machine.capbank.network.NetworkState; import crazypants.enderio.machine.capbank.packet.PacketGuiChange; import crazypants.enderio.machine.capbank.packet.PacketNetworkEnergyRequest; @@ -78,9 +77,12 @@ public class GuiCapBank extends GuiContainerBase { private int initialStateCount = -1; private boolean initState = true; + private final ContainerCapBank container; + public GuiCapBank(Entity player, InventoryPlayer playerInv, TileCapBank te) { super(new ContainerCapBank(player, playerInv, te)); capBank = te; + container = (ContainerCapBank) inventorySlots; updateState(); @@ -135,7 +137,6 @@ public class GuiCapBank extends GuiContainerBase { configB.setToolTip(Lang.localize("gui.machine.ioMode.overlay.tooltip")); List coords = new ArrayList(); - CapBankClientNetwork network = ClientNetworkManager.getInstance().getNetwork(capBank); if(network != null && network.getMembers().size() < 200) { for (TileCapBank cb : network.getMembers()) { coords.add(cb.getLocation()); @@ -247,7 +248,7 @@ public class GuiCapBank extends GuiContainerBase { protected void sendUpdateToServer() { if(network != NULL_NETWORK) { - PacketHandler.INSTANCE.sendToServer(new PacketGuiChange(capBank, network)); + PacketHandler.INSTANCE.sendToServer(new PacketGuiChange(capBank)); } } @@ -376,12 +377,12 @@ public class GuiCapBank extends GuiContainerBase { return false; } - if(capBank.getNetworkId() == -1) { + if(capBank.getNetwork() == null) { network = NULL_NETWORK; return true; } if(network == null || network == NULL_NETWORK) { - network = ClientNetworkManager.getInstance().getOrCreateNetwork(capBank.getNetworkId()); + network = (CapBankClientNetwork) capBank.getNetwork(); initialStateCount = network.getStateUpdateCount(); PacketHandler.INSTANCE.sendToServer(new PacketNetworkStateRequest(capBank)); return true; @@ -391,6 +392,7 @@ public class GuiCapBank extends GuiContainerBase { return true; } if(network.getStateUpdateCount() > initialStateCount) { + container.updateInventory(); updateFieldsFromState(); initState = false; return true; diff --git a/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java index e19bc8fc..956d56f8 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java @@ -11,20 +11,24 @@ 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.tileentity.TileEntity; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import cofh.api.energy.IEnergyContainerItem; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; import crazypants.enderio.TileEntityEio; import crazypants.enderio.conduit.IConduitBundle; import crazypants.enderio.machine.IIoConfigurable; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.RedstoneControlMode; -import crazypants.enderio.machine.capbank.network.CapBankNetwork; import crazypants.enderio.machine.capbank.network.ClientNetworkManager; import crazypants.enderio.machine.capbank.network.EnergyReceptor; +import crazypants.enderio.machine.capbank.network.ICapBankNetwork; +import crazypants.enderio.machine.capbank.network.InventoryImpl; import crazypants.enderio.machine.capbank.network.NetworkUtil; import crazypants.enderio.machine.capbank.packet.PacketNetworkIdRequest; import crazypants.enderio.network.PacketHandler; @@ -32,6 +36,9 @@ import crazypants.enderio.power.IInternalPowerReceptor; import crazypants.enderio.power.IPowerInterface; import crazypants.enderio.power.PowerHandlerUtil; import crazypants.util.BlockCoord; +import crazypants.util.EntityUtil; +import crazypants.util.Util; +import crazypants.vecmath.Vector3d; public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor, IInventory, IIoConfigurable { @@ -52,12 +59,20 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor private final List receptors = new ArrayList(); private boolean receptorsDirty = true; - private CapBankNetwork network; + private ICapBankNetwork network; + + private final ItemStack[] inventory; + + public TileCapBank() { + inventory = new ItemStack[4]; + } //Client side refernce to look up network state private int networkId = -1; private int idRequestTimer = 0; + private boolean dropItems; + @Override public BlockCoord getLocation() { return new BlockCoord(this); @@ -90,11 +105,11 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor return networkId; } - public CapBankNetwork getNetwork() { + public ICapBankNetwork getNetwork() { return network; } - public boolean setNetwork(CapBankNetwork network) { + public boolean setNetwork(ICapBankNetwork network) { this.network = network; return true; } @@ -119,6 +134,29 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor } } + public void moveInventoryToNetwork() { + if(network == null) { + return; + } + if(network.getInventory().getCapBank() == this && !InventoryImpl.isInventoryEmtpy(inventory)) { + for (TileCapBank cb : network.getMembers()) { + if(cb != this) { + for (int i = 0; i < inventory.length; i++) { + cb.inventory[i] = inventory[i]; + inventory[i] = null; + } + network.getInventory().setCapBank(cb); + break; + } + } + } + } + + public void onBreakBlock() { + //If we are holding the networks inventory when we care broken, tranfer it to another member of the network + moveInventoryToNetwork(); + } + @Override public void updateEntity() { if(worldObj.isRemote) { @@ -147,6 +185,8 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor if(receptorsDirty) { updateReceptors(); } + + doDropItems(); } private void updateNetwork(World world) { @@ -231,6 +271,11 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor TileEntity te = worldObj.getTileEntity(checkLoc.x, checkLoc.y, checkLoc.z); if(!(te instanceof TileCapBank)) { return PowerHandlerUtil.create(te); + } else { + TileCapBank other = (TileCapBank) te; + if(other.getType() != getType()) { + return PowerHandlerUtil.create(te); + } } return null; } @@ -271,11 +316,12 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor receptors.clear(); for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - IoMode ioMode = getIoMode(dir); - if(ioMode != IoMode.DISABLED && ioMode != IoMode.PULL) { - IPowerInterface pi = getReceptorForFace(dir); - if(pi != null) { - EnergyReceptor er = new EnergyReceptor(this, pi, dir); + IPowerInterface pi = getReceptorForFace(dir); + if(pi != null) { + EnergyReceptor er = new EnergyReceptor(this, pi, dir); + validateModeForReceptor(er); + IoMode ioMode = getIoMode(dir); + if(ioMode != IoMode.DISABLED && ioMode != IoMode.PULL) { receptors.add(er); } } @@ -285,6 +331,23 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor receptorsDirty = false; } + private void validateModeForReceptor(EnergyReceptor er) { + IoMode ioMode = getIoMode(er.getDir()); + if(ioMode == IoMode.PUSH_PULL && er.getConduit() == null) { + if(er.getReceptor().isOutputOnly()) { + setIoMode(er.getDir(), IoMode.PULL, false); + } else { + setIoMode(er.getDir(), IoMode.PUSH, false); + } + } + if(ioMode == IoMode.PULL && er.getReceptor().isInputOnly()) { + setIoMode(er.getDir(), IoMode.PUSH, false); + } else if(ioMode == IoMode.PUSH && er.getReceptor().isOutputOnly()) { + setIoMode(er.getDir(), IoMode.PULL, false); + } + + } + public void addEnergy(int energy) { if(network == null) { setEnergyStored(getEnergyStored() + energy); @@ -383,57 +446,57 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor //------------------- Inventory @Override - public int getSizeInventory() { - // TODO Auto-generated method stub - return 0; + public ItemStack getStackInSlot(int slot) { + if(network == null) { + return null; + } + return network.getInventory().getStackInSlot(slot); } @Override - public ItemStack getStackInSlot(int p_70301_1_) { - // TODO Auto-generated method stub - return null; + public ItemStack decrStackSize(int fromSlot, int amount) { + if(network == null) { + return null; + } + return network.getInventory().decrStackSize(fromSlot, amount); } @Override - public ItemStack decrStackSize(int p_70298_1_, int p_70298_2_) { - // TODO Auto-generated method stub - return null; + public void setInventorySlotContents(int slot, ItemStack itemstack) { + if(network == null) { + return; + } + network.getInventory().setInventorySlotContents(slot, itemstack); } @Override public ItemStack getStackInSlotOnClosing(int p_70304_1_) { - // TODO Auto-generated method stub return null; } @Override - public void setInventorySlotContents(int p_70299_1_, ItemStack p_70299_2_) { - // TODO Auto-generated method stub - + public int getSizeInventory() { + return 4; } @Override public String getInventoryName() { - // TODO Auto-generated method stub - return null; + return EnderIO.blockCapacitorBank.getUnlocalizedName() + ".name"; } @Override public boolean hasCustomInventoryName() { - // TODO Auto-generated method stub return false; } @Override public int getInventoryStackLimit() { - // TODO Auto-generated method stub - return 0; + return 1; } @Override public boolean isUseableByPlayer(EntityPlayer p_70300_1_) { - // TODO Auto-generated method stub - return false; + return true; } @Override @@ -445,18 +508,50 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor } @Override - public boolean isItemValidForSlot(int p_94041_1_, ItemStack p_94041_2_) { - // TODO Auto-generated method stub - return false; + public boolean isItemValidForSlot(int slot, ItemStack itemstack) { + if(itemstack == null) { + return false; + } + return itemstack.getItem() instanceof IEnergyContainerItem; + } + + public ItemStack[] getInventory() { + return inventory; + } + + public void dropItems() { + dropItems = true; + } + + public void doDropItems() { + if(!dropItems) { + return; + } + Vector3d dropLocation; + EntityPlayer player = worldObj.getClosestPlayer(xCoord, yCoord, zCoord, 32); + if(player != null) { + dropLocation = EntityUtil.getEntityPosition(player); + } else { + dropLocation = new Vector3d(xCoord, yCoord, zCoord); + } + Util.dropItems(worldObj, inventory, (int) dropLocation.x, (int) dropLocation.y, (int) dropLocation.z, false); + for (int i = 0; i < inventory.length; i++) { + inventory[i] = null; + } + dropItems = false; } //---------------- NBT @Override protected void writeCustomNBT(NBTTagCompound nbtRoot) { + writeCommonNBT(nbtRoot); + } - nbtRoot.setString("type", getType().getUid()); - nbtRoot.setInteger("energyStored", energyStored); + //Values common to both item and block form + public void writeCommonNBT(NBTTagCompound nbtRoot) { + getType().writeTypeToNBT(nbtRoot); + nbtRoot.setInteger(PowerHandlerUtil.STORED_ENERGY_NBT_KEY, energyStored); if(maxInput != -1) { nbtRoot.setInteger("maxInput", maxInput); @@ -478,13 +573,28 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor nbtRoot.setShort("face" + e.getKey().ordinal(), (short) e.getValue().ordinal()); } } + + NBTTagList itemList = new NBTTagList(); + for (int i = 0; i < inventory.length; i++) { + if(inventory[i] != null) { + NBTTagCompound itemStackNBT = new NBTTagCompound(); + itemStackNBT.setByte("Slot", (byte) i); + inventory[i].writeToNBT(itemStackNBT); + itemList.appendTag(itemStackNBT); + } + } + nbtRoot.setTag("Items", itemList); } @Override protected void readCustomNBT(NBTTagCompound nbtRoot) { + readCommonNBT(nbtRoot); + } - type = CapBankType.getTypeFromUID(nbtRoot.getString("type")); - energyStored = nbtRoot.getInteger("energyStored"); + //Values common to both item and block form + public void readCommonNBT(NBTTagCompound nbtRoot) { + type = CapBankType.readTypeFromNBT(nbtRoot); + energyStored = nbtRoot.getInteger(PowerHandlerUtil.STORED_ENERGY_NBT_KEY); if(nbtRoot.hasKey("maxInput")) { maxInput = nbtRoot.getInteger("maxInput"); @@ -516,6 +626,20 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor } } + for (int i = 0; i < inventory.length; i++) { + inventory[i] = null; + } + + if(nbtRoot.hasKey("Items")) { + NBTTagList itemList = (NBTTagList) nbtRoot.getTag("Items"); + for (int i = 0; i < itemList.tagCount(); i++) { + NBTTagCompound itemStack = itemList.getCompoundTagAt(i); + byte slot = itemStack.getByte("Slot"); + if(slot >= 0 && slot < inventory.length) { + inventory[slot] = ItemStack.loadItemStackFromNBT(itemStack); + } + } + } } } diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/CapBankClientNetwork.java b/src/main/java/crazypants/enderio/machine/capbank/network/CapBankClientNetwork.java index 036b3644..b75dfc57 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/network/CapBankClientNetwork.java +++ b/src/main/java/crazypants/enderio/machine/capbank/network/CapBankClientNetwork.java @@ -1,11 +1,15 @@ package crazypants.enderio.machine.capbank.network; import java.util.ArrayList; +import java.util.Collection; import java.util.List; +import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; +import net.minecraft.world.World; import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.machine.capbank.TileCapBank; +import crazypants.util.BlockCoord; public class CapBankClientNetwork implements ICapBankNetwork { @@ -14,7 +18,7 @@ public class CapBankClientNetwork implements ICapBankNetwork { private int maxEnergySent; private int maxEnergyRecieved; - private int stateUpdateCount = 0; + private int stateUpdateCount; private int maxIO; private long maxEnergyStored; private long energyStored; @@ -22,6 +26,10 @@ public class CapBankClientNetwork implements ICapBankNetwork { private RedstoneControlMode inputControlMode = RedstoneControlMode.IGNORE; private RedstoneControlMode outputControlMode = RedstoneControlMode.IGNORE; + private final InventoryImpl inventory = new InventoryImpl(); + + private float aveChange; + public CapBankClientNetwork(int id) { this.id = id; } @@ -31,7 +39,7 @@ public class CapBankClientNetwork implements ICapBankNetwork { return id; } - public void setState(NetworkState state) { + public void setState(World world, NetworkState state) { maxEnergyRecieved = state.getMaxInput(); maxEnergySent = state.getMaxOutput(); maxIO = state.getMaxIO(); @@ -39,6 +47,18 @@ public class CapBankClientNetwork implements ICapBankNetwork { energyStored = state.getEnergyStored(); inputControlMode = state.getInputMode(); outputControlMode = state.getOutputMode(); + + BlockCoord bc = state.getInventoryImplLocation(); + if(bc == null) { + inventory.setCapBank(null); + } else { + TileEntity te = world.getTileEntity(bc.x, bc.y, bc.z); + if(te instanceof TileCapBank) { + inventory.setCapBank((TileCapBank) te); + } + } + aveChange = state.getAverageChange(); + stateUpdateCount++; } @@ -50,6 +70,7 @@ public class CapBankClientNetwork implements ICapBankNetwork { this.stateUpdateCount = stateUpdateCount; } + @Override public void addMember(TileCapBank capBank) { members.add(capBank); } @@ -63,6 +84,7 @@ public class CapBankClientNetwork implements ICapBankNetwork { public void destroyNetwork() { for (TileCapBank cb : members) { cb.setNetworkId(-1); + cb.setNetwork(null); } } @@ -132,4 +154,48 @@ public class CapBankClientNetwork implements ICapBankNetwork { this.outputControlMode = outputControlMode; } + @Override + public InventoryImpl getInventory() { + return inventory; + } + + @Override + public float getAverageChangePerTick() { + return aveChange; + } + + public void setAverageChangePerTick(float aveChange) { + this.aveChange = aveChange; + } + + @Override + public NetworkState getState() { + return new NetworkState(this); + } + + @Override + public void onUpdateEntity(TileCapBank tileCapBank) { + } + + @Override + public void addEnergy(int energy) { + } + + @Override + public int recieveEnergy(int maxReceive, boolean simulate) { + return 0; + } + + @Override + public void removeReceptors(Collection receptors) { + } + + @Override + public void addReceptors(Collection receptors) { + } + + @Override + public void updateRedstoneSignal(TileCapBank tileCapBank, boolean recievingSignal) { + } + } diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java b/src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java index 5261a73b..9cd70b76 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java +++ b/src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java @@ -7,7 +7,9 @@ import java.util.Iterator; import java.util.List; import java.util.Set; +import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import cofh.api.energy.IEnergyContainerItem; import cpw.mods.fml.common.gameevent.TickEvent.ServerTickEvent; import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.ConduitNetworkTickHandler; @@ -20,6 +22,7 @@ import crazypants.enderio.machine.capbank.CapBankType; import crazypants.enderio.machine.capbank.TileCapBank; import crazypants.enderio.machine.capbank.packet.PacketNetworkStateResponse; import crazypants.enderio.power.IPowerInterface; +import crazypants.enderio.power.PerTickIntAverageCalculator; import crazypants.util.BlockCoord; import crazypants.util.RoundRobinIterator; @@ -59,6 +62,10 @@ public class CapBankNetwork implements ICapBankNetwork { private TickListener tickListener; + private PerTickIntAverageCalculator powerTracker = new PerTickIntAverageCalculator(); + + private final InventoryImpl inventory = new InventoryImpl(); + public CapBankNetwork(int id) { this.id = id; } @@ -82,19 +89,13 @@ public class CapBankNetwork implements ICapBankNetwork { } } setNetwork(world, cap); - //notifyNetworkOfUpdate(); EnderIO.packetPipeline.sendToAllAround(new PacketNetworkStateResponse(this), cap); } - //public void notifyNetworkOfUpdate() { - // for (TileCapBank cb : capBanks) { - // cb.getWorldObj().markBlockForUpdate(cb.xCoord, cb.yCoord, cb.zCoord); - // } - // } protected void setNetwork(World world, TileCapBank cap) { if(cap != null && cap.setNetwork(this)) { - addCapBank(cap); + addMember(cap); Collection neighbours = NetworkUtil.getNeigbours(cap); for (TileCapBank neighbour : neighbours) { if(neighbour.getNetwork() == null) { @@ -128,7 +129,8 @@ public class CapBankNetwork implements ICapBankNetwork { return capBanks; } - public void addCapBank(TileCapBank cap) { + @Override + public void addMember(TileCapBank cap) { if(!capBanks.contains(cap)) { capBanks.add(cap); long newIO = maxIO + cap.getType().getMaxIO(); @@ -153,20 +155,37 @@ public class CapBankNetwork implements ICapBankNetwork { addReceptors(recs); } + if(inventory.isEmtpy()) { + inventory.setCapBank(cap); + } else if(!InventoryImpl.isInventoryEmtpy(cap)) { + if(inventory.isEmtpy()) { + inventory.setCapBank(cap); + } else { + cap.dropItems(); + } + } + } } + @Override + public InventoryImpl getInventory() { + return inventory; + } + @Override public int getId() { return id; } - public NetworkState getClientState() { + @Override + public NetworkState getState() { return new NetworkState(this); } //--------- Tick Handling + @Override public void onUpdateEntity(TileCapBank tileCapBank) { World world = tileCapBank.getWorldObj(); if(world == null) { @@ -183,12 +202,18 @@ public class CapBankNetwork implements ICapBankNetwork { } private void doNetworkTick() { + + chargeItems(inventory.getStacks()); transmitEnergy(); if(energyStored != prevEnergyStored) { distributeEnergyToBanks(); } + if(prevEnergyStored != -1) { + powerTracker.tick((int) (energyStored - prevEnergyStored)); + } prevEnergyStored = energyStored; + } private void transmitEnergy() { @@ -201,12 +226,7 @@ public class CapBankNetwork implements ICapBankNetwork { return; } - int available; - if(energyStored > getMaxEnergySent()) { - available = getMaxEnergySent(); - } else { - available = (int) energyStored; - } + int available = getEnergyAvailableForTick(getMaxEnergySent()); if(available <= 0) { return; } @@ -223,8 +243,19 @@ public class CapBankNetwork implements ICapBankNetwork { totalSent += sent; available -= sent; } - addEnergy(-totalSent); + if(!type.isCreative()) { + addEnergy(-totalSent); + } + } + protected int getEnergyAvailableForTick(int limit) { + int available; + if(energyStored > limit) { + available = limit; + } else { + available = (int) energyStored; + } + return available; } private int sendPowerTo(EnergyReceptor next, int available) { @@ -242,6 +273,38 @@ public class CapBankNetwork implements ICapBankNetwork { return result; } + public boolean chargeItems(ItemStack[] items) { + if(items == null) { + return false; + } + boolean chargedItem = false; + int available = getEnergyAvailableForTick(getMaxIO()); + for (ItemStack item : items) { + if(item != null && available > 0) { + int used = 0; + if(item.getItem() instanceof IEnergyContainerItem) { + IEnergyContainerItem chargable = (IEnergyContainerItem) item.getItem(); + + int max = chargable.getMaxEnergyStored(item); + int cur = chargable.getEnergyStored(item); + int canUse = Math.min(available, max - cur); + if(cur < max) { + used = chargable.receiveEnergy(item, canUse, false); + } + + } + if(used > 0) { + if(!type.isCreative()) { + addEnergy(-used); + } + chargedItem = true; + available -= used; + } + } + } + return chargedItem; + } + private void distributeEnergyToBanks() { if(capBanks.isEmpty()) { return; @@ -257,6 +320,12 @@ public class CapBankNetwork implements ICapBankNetwork { //------ Power + @Override + public float getAverageChangePerTick() { + return powerTracker.getAverage(); + } + + @Override public int recieveEnergy(int maxReceive, boolean simulate) { if(maxReceive <= 0 || !inputRedstoneConditionMet) { return 0; @@ -268,12 +337,16 @@ public class CapBankNetwork implements ICapBankNetwork { } int res = Math.min(maxReceive, (int) spaceAvailable); res = Math.min(maxReceive, getMaxEnergyRecieved()); - if(!simulate && !type.isCreative()) { - addEnergy(res); + if(!simulate) { + if(!type.isCreative()) { + addEnergy(res); + } } + return res; } + @Override public void addEnergy(int energy) { energyStored += energy; if(energyStored > maxEnergyStored) { @@ -288,6 +361,7 @@ public class CapBankNetwork implements ICapBankNetwork { receptorIterator = null; } + @Override public void addReceptors(Collection rec) { if(rec.isEmpty()) { return; @@ -296,6 +370,7 @@ public class CapBankNetwork implements ICapBankNetwork { receptorIterator = null; } + @Override public void removeReceptors(Collection rec) { if(rec.isEmpty()) { return; @@ -408,6 +483,7 @@ public class CapBankNetwork implements ICapBankNetwork { updateRedstoneConditions(); } + @Override public void updateRedstoneSignal(TileCapBank tileCapBank, boolean recievingSignal) { if(recievingSignal) { redstoneRecievers.add(tileCapBank.getLocation()); diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/ClientNetworkManager.java b/src/main/java/crazypants/enderio/machine/capbank/network/ClientNetworkManager.java index a461319c..41b78d75 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/network/ClientNetworkManager.java +++ b/src/main/java/crazypants/enderio/machine/capbank/network/ClientNetworkManager.java @@ -3,6 +3,7 @@ package crazypants.enderio.machine.capbank.network; import java.util.HashMap; import java.util.Map; +import net.minecraft.world.World; import crazypants.enderio.machine.capbank.TileCapBank; public class ClientNetworkManager { @@ -22,20 +23,22 @@ public class ClientNetworkManager { CapBankClientNetwork res = networks.get(id); if(res != null) { res.destroyNetwork(); + networks.remove(res); } } - public void updateState(int id, NetworkState state) { + public void updateState(World world, int id, NetworkState state) { CapBankClientNetwork network = getOrCreateNetwork(id); - network.setState(state); + network.setState(world, state); } - public void updateEnergyStored(int id, long energyStored) { + public void updateEnergy(int id, long energyStored, float avChange) { CapBankClientNetwork res = networks.get(id); if(res == null) { return; } res.setEnergyStored(energyStored); + res.setAverageChangePerTick(avChange); } public CapBankClientNetwork getOrCreateNetwork(int id) { @@ -52,11 +55,4 @@ public class ClientNetworkManager { network.addMember(tileCapBank); } - public CapBankClientNetwork getNetwork(TileCapBank tr) { - if(tr == null) { - return null; - } - return networks.get(tr.getNetworkId()); - } - } diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/ICapBankNetwork.java b/src/main/java/crazypants/enderio/machine/capbank/network/ICapBankNetwork.java index c93d7581..1f3bbac6 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/network/ICapBankNetwork.java +++ b/src/main/java/crazypants/enderio/machine/capbank/network/ICapBankNetwork.java @@ -1,5 +1,6 @@ package crazypants.enderio.machine.capbank.network; +import java.util.Collection; import java.util.List; import crazypants.enderio.machine.RedstoneControlMode; @@ -7,13 +8,32 @@ import crazypants.enderio.machine.capbank.TileCapBank; public interface ICapBankNetwork { + //------ Network + int getId(); - int getMaxIO(); + void addMember(TileCapBank cap); + + List getMembers(); + + void destroyNetwork(); + + NetworkState getState(); + + void onUpdateEntity(TileCapBank tileCapBank); + + + //------ Energy + + long getEnergyStored(); + + void addEnergy(int energy); + + int recieveEnergy(int maxReceive, boolean simulate); long getMaxEnergyStored(); - long getEnergyStored(); + int getMaxIO(); int getMaxEnergySent(); @@ -23,16 +43,30 @@ public interface ICapBankNetwork { void setMaxEnergyReccieved(int max); - void destroyNetwork(); + void removeReceptors(Collection receptors); - List getMembers(); + void addReceptors(Collection receptors); - public abstract void setOutputControlMode(RedstoneControlMode outputControlMode); - public abstract RedstoneControlMode getOutputControlMode(); + //------ Inventory + + InventoryImpl getInventory(); + + + //------ Redstone + + void setOutputControlMode(RedstoneControlMode outputControlMode); + + RedstoneControlMode getOutputControlMode(); + + void setInputControlMode(RedstoneControlMode inputControlMode); + + RedstoneControlMode getInputControlMode(); + + void updateRedstoneSignal(TileCapBank tileCapBank, boolean recievingSignal); + + public abstract float getAverageChangePerTick(); - public abstract void setInputControlMode(RedstoneControlMode inputControlMode); - public abstract RedstoneControlMode getInputControlMode(); } diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/InventoryImpl.java b/src/main/java/crazypants/enderio/machine/capbank/network/InventoryImpl.java new file mode 100644 index 00000000..b0bd241c --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/capbank/network/InventoryImpl.java @@ -0,0 +1,157 @@ +package crazypants.enderio.machine.capbank.network; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import cofh.api.energy.IEnergyContainerItem; +import crazypants.enderio.EnderIO; +import crazypants.enderio.machine.capbank.TileCapBank; + +public class InventoryImpl implements IInventory { + + public static boolean isInventoryEmtpy(TileCapBank cap) { + for (ItemStack st : cap.getInventory()) { + if(st != null) { + return false; + } + } + return true; + } + + public static boolean isInventoryEmtpy(ItemStack[] inv) { + if(inv == null) { + return true; + } + for (ItemStack st : inv) { + if(st != null) { + return false; + } + } + return true; + } + + private ItemStack[] inventory; + + private TileCapBank capBank; + + public InventoryImpl() { + } + + public TileCapBank getCapBank() { + return capBank; + } + + public void setCapBank(TileCapBank cap) { + capBank = cap; + if(cap == null) { + inventory = null; + return; + } + inventory = cap.getInventory(); + } + + public boolean isEmtpy() { + return isInventoryEmtpy(inventory); + } + + public ItemStack[] getStacks() { + return inventory; + } + + @Override + public ItemStack getStackInSlot(int slot) { + if(inventory == null) { + return null; + } + if(slot < 0 || slot >= inventory.length) { + return null; + } + return inventory[slot]; + } + + @Override + public ItemStack decrStackSize(int fromSlot, int amount) { + if(inventory == null) { + return null; + } + + if(fromSlot < 0 || fromSlot >= inventory.length) { + return null; + } + ItemStack item = inventory[fromSlot]; + if(item == null) { + return null; + } + if(item.stackSize <= amount) { + ItemStack result = item.copy(); + inventory[fromSlot] = null; + return result; + } + item.stackSize -= amount; + return item.copy(); + } + + @Override + public void setInventorySlotContents(int slot, ItemStack itemstack) { + if(inventory == null) { + return; + } + if(slot < 0 || slot >= inventory.length) { + return; + } + inventory[slot] = itemstack; + } + + @Override + public int getSizeInventory() { + return 4; + } + + //--- constant values + + @Override + public ItemStack getStackInSlotOnClosing(int p_70304_1_) { + return null; + } + + @Override + public String getInventoryName() { + return EnderIO.blockCapBank.getUnlocalizedName() + ".name"; + } + + @Override + public boolean hasCustomInventoryName() { + return false; + } + + @Override + public int getInventoryStackLimit() { + return 1; + } + + @Override + public boolean isUseableByPlayer(EntityPlayer p_70300_1_) { + return true; + } + + @Override + public boolean isItemValidForSlot(int slot, ItemStack itemstack) { + if(itemstack == null) { + return false; + } + return itemstack.getItem() instanceof IEnergyContainerItem; + } + + @Override + public void openInventory() { + } + + @Override + public void closeInventory() { + } + + @Override + public void markDirty() { + } + +} diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/NetworkState.java b/src/main/java/crazypants/enderio/machine/capbank/network/NetworkState.java index 3766e0b4..78b7d6a1 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/network/NetworkState.java +++ b/src/main/java/crazypants/enderio/machine/capbank/network/NetworkState.java @@ -2,6 +2,8 @@ package crazypants.enderio.machine.capbank.network; import io.netty.buffer.ByteBuf; import crazypants.enderio.machine.RedstoneControlMode; +import crazypants.enderio.machine.capbank.TileCapBank; +import crazypants.util.BlockCoord; public class NetworkState { @@ -12,20 +14,24 @@ public class NetworkState { private final int maxOutput; private final RedstoneControlMode inputMode; private final RedstoneControlMode outputMode; + private final BlockCoord invImplLoc; + private final float averageChange; public NetworkState() { - this(0, 0, 0, 0, 0, RedstoneControlMode.IGNORE, RedstoneControlMode.IGNORE); + this(0, 0, 0, 0, 0, RedstoneControlMode.IGNORE, RedstoneControlMode.IGNORE, null, 0); } public NetworkState(long energyStored, long maxEnergyStored, int maxIO, int maxInput, int maxOutput, RedstoneControlMode inputMode, - RedstoneControlMode ouputMode) { + RedstoneControlMode outputMode, BlockCoord invImplLoc, float averageChange) { this.energyStored = energyStored; this.maxEnergyStored = maxEnergyStored; this.maxIO = maxIO; this.maxInput = maxInput; this.maxOutput = maxOutput; this.inputMode = inputMode; - outputMode = ouputMode; + this.outputMode = outputMode; + this.invImplLoc = invImplLoc; + this.averageChange = averageChange; } public NetworkState(ICapBankNetwork network) { @@ -36,6 +42,13 @@ public class NetworkState { maxOutput = network.getMaxEnergySent(); inputMode = network.getInputControlMode(); outputMode = network.getOutputControlMode(); + TileCapBank cb = network.getInventory().getCapBank(); + if(cb != null) { + invImplLoc = cb.getLocation(); + } else { + invImplLoc = null; + } + averageChange = network.getAverageChangePerTick(); } public long getEnergyStored() { @@ -66,6 +79,14 @@ public class NetworkState { return outputMode; } + public BlockCoord getInventoryImplLocation() { + return invImplLoc; + } + + public float getAverageChange() { + return averageChange; + } + public void writeToBuf(ByteBuf buf) { buf.writeLong(energyStored); buf.writeLong(maxEnergyStored); @@ -74,11 +95,17 @@ public class NetworkState { buf.writeInt(maxOutput); buf.writeShort(inputMode.ordinal()); buf.writeShort(outputMode.ordinal()); + buf.writeBoolean(invImplLoc != null); + if(invImplLoc != null) { + invImplLoc.writeToBuf(buf); + } + buf.writeFloat(averageChange); } public static NetworkState readFromBuf(ByteBuf buf) { return new NetworkState(buf.readLong(), buf.readLong(), buf.readInt(), buf.readInt(), buf.readInt(), - RedstoneControlMode.values()[buf.readShort()], RedstoneControlMode.values()[buf.readShort()]); + RedstoneControlMode.values()[buf.readShort()], RedstoneControlMode.values()[buf.readShort()], + buf.readBoolean() ? BlockCoord.readFromBuf(buf) : null, buf.readFloat()); } @Override diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/NetworkUtil.java b/src/main/java/crazypants/enderio/machine/capbank/network/NetworkUtil.java index 0fe8dfbf..ae78be9d 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/network/NetworkUtil.java +++ b/src/main/java/crazypants/enderio/machine/capbank/network/NetworkUtil.java @@ -47,7 +47,7 @@ public class NetworkUtil { } private static boolean reuseNetwork(TileCapBank cap, Collection neighbours, World world) { - CapBankNetwork network = null; + ICapBankNetwork network = null; for (TileCapBank conduit : neighbours) { if(network == null) { network = conduit.getNetwork(); @@ -59,7 +59,7 @@ public class NetworkUtil { return false; } if(cap.setNetwork(network)) { - network.addCapBank(cap); + network.addMember(cap); //network.notifyNetworkOfUpdate(); return true; } diff --git a/src/main/java/crazypants/enderio/machine/capbank/packet/PacketGuiChange.java b/src/main/java/crazypants/enderio/machine/capbank/packet/PacketGuiChange.java index 7f09a0ee..6962a99f 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/packet/PacketGuiChange.java +++ b/src/main/java/crazypants/enderio/machine/capbank/packet/PacketGuiChange.java @@ -5,7 +5,6 @@ import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.machine.capbank.TileCapBank; -import crazypants.enderio.machine.capbank.network.CapBankClientNetwork; import crazypants.enderio.machine.capbank.network.ICapBankNetwork; public class PacketGuiChange extends PacketCapBank { @@ -18,8 +17,9 @@ public class PacketGuiChange extends PacketCapBank { public PacketGuiChange() { } - public PacketGuiChange(TileCapBank capBank, CapBankClientNetwork network) { + public PacketGuiChange(TileCapBank capBank) { super(capBank); + ICapBankNetwork network = capBank.getNetwork(); maxSend = network.getMaxEnergySent(); maxRec = network.getMaxEnergyRecieved(); inputMode = network.getInputControlMode(); diff --git a/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkEnergyResponse.java b/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkEnergyResponse.java index 7d5ee2c3..51d83f58 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkEnergyResponse.java +++ b/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkEnergyResponse.java @@ -11,6 +11,7 @@ public class PacketNetworkEnergyResponse implements IMessage, IMessageHandler { @@ -36,6 +37,7 @@ public class PacketNetworkIdResponse extends PacketCapBank { @@ -16,14 +17,14 @@ public class PacketNetworkStateResponse implements IMessage, IMessageHandler secondsCache; + + public PerTickIntAverageCalculator() { + this(5); + } + + public PerTickIntAverageCalculator(int numSeconds) { + secondsCache = new LimitedQueue(numSeconds); + } + + public float getAverage() { + int numTicks = index + (secondsCache.size() * 20); + if(numTicks == 0) { + return 0; + } + float totalPower = lastSecondTotal; + for (Float fl : secondsCache) { + totalPower += fl; + } + return totalPower / numTicks; + } + + public void tick(int value) { + lastSecondTotal += value; + index++; + if(index == 20) { + secondsCache.add(lastSecondTotal); + lastSecondTotal = 0; + index = 0; + } + } + + private static class LimitedQueue extends LinkedList { + + private final int limit; + + public LimitedQueue(int limit) { + this.limit = limit; + } + + @Override + public boolean add(E o) { + super.add(o); + while (size() > limit) { + super.remove(); + } + return true; + } + } + +} \ No newline at end of file diff --git a/src/main/java/crazypants/enderio/power/PowerHandlerUtil.java b/src/main/java/crazypants/enderio/power/PowerHandlerUtil.java index 18acc6f2..2e902492 100644 --- a/src/main/java/crazypants/enderio/power/PowerHandlerUtil.java +++ b/src/main/java/crazypants/enderio/power/PowerHandlerUtil.java @@ -5,14 +5,19 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; import cofh.api.energy.IEnergyConnection; import cofh.api.energy.IEnergyHandler; +import cofh.api.energy.IEnergyReceiver; public class PowerHandlerUtil { + public static final String STORED_ENERGY_NBT_KEY = "storedEnergyRF"; + public static IPowerInterface create(Object o) { if(o instanceof IEnergyHandler) { - return new PowerInterfaceRF((IEnergyHandler) o); + return new EnergyHandlerPI((IEnergyHandler) o); + } else if(o instanceof IEnergyReceiver) { + return new EnergyReceiverPI((IEnergyReceiver) o); } else if(o instanceof IEnergyConnection) { - return new PowerInterfaceConnectionRF((IEnergyConnection) o); + return new EnergyConnectionPI((IEnergyConnection) o); } return null; } @@ -28,7 +33,7 @@ public class PowerHandlerUtil { return (int) (storedMj * 10); } - return tag.getInteger("storedEnergyRF"); + return tag.getInteger(STORED_ENERGY_NBT_KEY); } public static void setStoredEnergyForItem(ItemStack item, int storedEnergy) { @@ -36,7 +41,7 @@ public class PowerHandlerUtil { if(tag == null) { tag = new NBTTagCompound(); } - tag.setInteger("storedEnergyRF", storedEnergy); + tag.setInteger(STORED_ENERGY_NBT_KEY, storedEnergy); item.setTagCompound(tag); } diff --git a/src/main/java/crazypants/enderio/waila/IWailaInfoProvider.java b/src/main/java/crazypants/enderio/waila/IWailaInfoProvider.java index fb92f6f0..9cbee265 100644 --- a/src/main/java/crazypants/enderio/waila/IWailaInfoProvider.java +++ b/src/main/java/crazypants/enderio/waila/IWailaInfoProvider.java @@ -3,9 +3,9 @@ package crazypants.enderio.waila; import java.text.NumberFormat; import java.util.List; -import crazypants.enderio.gui.IAdvancedTooltipProvider; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; +import crazypants.enderio.gui.IAdvancedTooltipProvider; public interface IWailaInfoProvider { @@ -16,6 +16,7 @@ public interface IWailaInfoProvider { public static final NumberFormat fmt = NumberFormat.getNumberInstance(); + /** * Adds the block's info to the WAILA information * @param tooltip - current list of strings in the WAILA body diff --git a/src/main/java/crazypants/enderio/waila/WailaCompat.java b/src/main/java/crazypants/enderio/waila/WailaCompat.java index 10a5b855..4b0464c1 100644 --- a/src/main/java/crazypants/enderio/waila/WailaCompat.java +++ b/src/main/java/crazypants/enderio/waila/WailaCompat.java @@ -1,6 +1,9 @@ package crazypants.enderio.waila; -import static crazypants.enderio.waila.IWailaInfoProvider.*; +import static crazypants.enderio.waila.IWailaInfoProvider.BIT_BASIC; +import static crazypants.enderio.waila.IWailaInfoProvider.BIT_COMMON; +import static crazypants.enderio.waila.IWailaInfoProvider.BIT_DETAILED; +import static crazypants.enderio.waila.IWailaInfoProvider.fmt; import info.jbcs.minecraft.chisel.api.IFacade; import java.util.List; @@ -32,6 +35,7 @@ import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.gui.TooltipAddera; import crazypants.enderio.machine.IIoConfigurable; import crazypants.enderio.machine.IoMode; +import crazypants.enderio.machine.capbank.TileCapBank; import crazypants.enderio.machine.power.TileCapacitorBank; import crazypants.enderio.power.IInternalPowerReceptor; import crazypants.util.Lang; @@ -56,6 +60,7 @@ public class WailaCompat implements IWailaDataProvider { // registrar.registerSyncedNBTKey("*", IInternalPowerReceptor.class); ConfigHandler.instance().addConfig(EnderIO.MOD_NAME, "facades.hidden", "Sneaky Facades"); + IWailaInfoProvider.fmt.setMaximumFractionDigits(1); } @Override @@ -149,7 +154,7 @@ public class WailaCompat implements IWailaDataProvider { } } - if(te instanceof IInternalPowerReceptor && accessor.getNBTData().hasKey("storedEnergyRF")) { + if(te instanceof IInternalPowerReceptor && accessor.getNBTData().hasKey("storedEnergyRF") && !(te instanceof TileCapBank)) { IInternalPowerReceptor power = (IInternalPowerReceptor) te; if(power.displayPower()) { diff --git a/src/main/java/crazypants/util/BlockCoord.java b/src/main/java/crazypants/util/BlockCoord.java index 664c5026..ee63af17 100644 --- a/src/main/java/crazypants/util/BlockCoord.java +++ b/src/main/java/crazypants/util/BlockCoord.java @@ -1,5 +1,6 @@ package crazypants.util; +import io.netty.buffer.ByteBuf; import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -64,19 +65,25 @@ public final class BlockCoord { @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; + } BlockCoord other = (BlockCoord) obj; - if(x != other.x) + if(x != other.x) { return false; - if(y != other.y) + } + if(y != other.y) { return false; - if(z != other.z) + } + if(z != other.z) { return false; + } return true; } @@ -88,4 +95,14 @@ public final class BlockCoord { public boolean equals(int xCoord, int yCoord, int zCoord) { return x == xCoord && y == yCoord && z == zCoord; } + + public void writeToBuf(ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); + } + + public static BlockCoord readFromBuf(ByteBuf buf) { + return new BlockCoord(buf.readInt(), buf.readInt(), buf.readInt()); + } } diff --git a/src/main/java/crazypants/util/Util.java b/src/main/java/crazypants/util/Util.java index 9180165d..b319ba4c 100644 --- a/src/main/java/crazypants/util/Util.java +++ b/src/main/java/crazypants/util/Util.java @@ -4,7 +4,6 @@ import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import java.util.UUID; import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; @@ -18,7 +17,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemPotion; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; @@ -191,6 +189,17 @@ public class Util { } + public static void dropItems(World world, ItemStack[] inventory, int x, int y, int z, boolean doRandomSpread) { + if(inventory == null) { + return; + } + for (ItemStack stack : inventory) { + if(stack != null && stack.stackSize > 0) { + dropItems(world, stack.copy(), x, y, z, doRandomSpread); + } + } + } + public static void dropItems(World world, IInventory inventory, int x, int y, int z, boolean doRandomSpread) { for (int l = 0; l < inventory.getSizeInventory(); ++l) { ItemStack items = inventory.getStackInSlot(l); @@ -357,25 +366,25 @@ public class Util { double d2 = 999.0D; if(i > l) { - d0 = (double) l + 1.0D; + d0 = l + 1.0D; } else if(i < l) { - d0 = (double) l + 0.0D; + d0 = l + 0.0D; } else { flag6 = false; } if(j > i1) { - d1 = (double) i1 + 1.0D; + d1 = i1 + 1.0D; } else if(j < i1) { - d1 = (double) i1 + 0.0D; + d1 = i1 + 0.0D; } else { flag3 = false; } if(k > j1) { - d2 = (double) j1 + 1.0D; + d2 = j1 + 1.0D; } else if(k < j1) { - d2 = (double) j1 + 0.0D; + d2 = j1 + 0.0D; } else { flag4 = false; } @@ -433,20 +442,20 @@ public class Util { } Vec3 vec32 = Vec3.createVectorHelper(startVec.xCoord, startVec.yCoord, startVec.zCoord); - l = (int) (vec32.xCoord = (double) MathHelper.floor_double(startVec.xCoord)); + l = (int) (vec32.xCoord = MathHelper.floor_double(startVec.xCoord)); if(b0 == 5) { --l; ++vec32.xCoord; } - i1 = (int) (vec32.yCoord = (double) MathHelper.floor_double(startVec.yCoord)); + i1 = (int) (vec32.yCoord = MathHelper.floor_double(startVec.yCoord)); if(b0 == 1) { --i1; ++vec32.yCoord; } - j1 = (int) (vec32.zCoord = (double) MathHelper.floor_double(startVec.zCoord)); + j1 = (int) (vec32.zCoord = MathHelper.floor_double(startVec.zCoord)); if(b0 == 3) { --j1; From 0c71f0776992c4657b8ecff3e4a7fcc7d1d86311 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Thu, 4 Dec 2014 14:35:57 +0800 Subject: [PATCH 06/12] Added power level delta to GUI and WAILA --- .../enderio/machine/capbank/BlockCapBank.java | 18 +----------------- .../enderio/machine/capbank/GuiCapBank.java | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java index d2823ae2..e7701dbb 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java @@ -298,22 +298,6 @@ public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTool return 0; } - // @Override - // public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { - // if(world.isRemote) { - // return; - // } - // TileEntity te = world.getTileEntity(x, y, z); - // if(!(te instanceof TileCapBank)) { - // return; - // } - // - // TileCapBank cb = (TileCapBank) te; - // cb.addEnergy(PowerHandlerUtil.getStoredEnergyForItem(stack)); - // - // world.markBlockForUpdate(x, y, z); - // } - @Override public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { super.onBlockPlacedBy(world, x, y, z, player, stack); @@ -470,7 +454,7 @@ public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTool fmt.format(max), EnumChatFormatting.RESET)); - float change = nw.getAverageChangePerTick(); + int change = Math.round(nw.getAverageChangePerTick()); String color = EnumChatFormatting.WHITE.toString(); if(change > 0) { color = EnumChatFormatting.GREEN.toString() + "+"; diff --git a/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java index cf77c2c0..09c60a2e 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java @@ -10,6 +10,7 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.Entity; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.EnumChatFormatting; import org.lwjgl.opengl.GL11; @@ -94,7 +95,19 @@ public class GuiCapBank extends GuiContainerBase { protected void updateText() { text.clear(); text.add(PowerDisplayUtil.formatPower(network.getEnergyStored()) + " " + PowerDisplayUtil.ofStr()); - text.add(PowerDisplayUtil.formatPower(network.getMaxEnergyStored()) + " " + PowerDisplayUtil.abrevation()); + text.add(EnumChatFormatting.WHITE + PowerDisplayUtil.formatPower(network.getMaxEnergyStored()) + " " + EnumChatFormatting.GRAY + + PowerDisplayUtil.abrevation()); + + float change = network.getAverageChangePerTick(); + String color = EnumChatFormatting.WHITE.toString(); + if(change > 0) { + color = EnumChatFormatting.GREEN.toString() + "+"; + } else if(change < 0) { + color = EnumChatFormatting.RED.toString(); + } + text.add(String.format("%s%s%s" + PowerDisplayUtil.abrevation() + PowerDisplayUtil.perTickStr(), color, + PowerDisplayUtil.formatPower(Math.round(change)), " " + + EnumChatFormatting.GRAY.toString())); } }); From 1856abcc149b3cd0907025aad58e9686b5c476de Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Thu, 4 Dec 2014 17:41:41 +0800 Subject: [PATCH 07/12] new cap banks integrate properly with conduits. Now uses interface so could add support for other power storage implementations. --- .../conduit/power/NetworkPowerManager.java | 70 +++++++------- .../enderio/machine/capbank/BlockCapBank.java | 8 +- .../enderio/machine/capbank/GuiCapBank.java | 24 ++--- .../enderio/machine/capbank/TileCapBank.java | 92 +++++++++++++++---- .../capbank/network/CapBankClientNetwork.java | 48 ++++++++-- .../capbank/network/CapBankNetwork.java | 58 +++++++++--- .../capbank/network/ICapBankNetwork.java | 26 ++++-- .../machine/capbank/network/NetworkState.java | 8 +- .../capbank/packet/PacketGuiChange.java | 8 +- .../packet/PacketNetworkEnergyResponse.java | 2 +- .../machine/monitor/TilePowerMonitor.java | 17 ++-- .../machine/power/TileCapacitorBank.java | 28 +++++- .../enderio/power/IPowerStorage.java | 25 +++++ 13 files changed, 298 insertions(+), 116 deletions(-) create mode 100644 src/main/java/crazypants/enderio/power/IPowerStorage.java diff --git a/src/main/java/crazypants/enderio/conduit/power/NetworkPowerManager.java b/src/main/java/crazypants/enderio/conduit/power/NetworkPowerManager.java index 089aeb70..a1906b7b 100644 --- a/src/main/java/crazypants/enderio/conduit/power/NetworkPowerManager.java +++ b/src/main/java/crazypants/enderio/conduit/power/NetworkPowerManager.java @@ -18,8 +18,8 @@ import crazypants.enderio.conduit.ConduitNetworkTickHandler.TickListener; import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.power.PowerConduitNetwork.ReceptorEntry; import crazypants.enderio.config.Config; -import crazypants.enderio.machine.power.TileCapacitorBank; import crazypants.enderio.power.IPowerInterface; +import crazypants.enderio.power.IPowerStorage; public class NetworkPowerManager { @@ -68,14 +68,14 @@ public class NetworkPowerManager { return maxEnergyStored; } - public int getPowerInCapacitorBanks() { + public long getPowerInCapacitorBanks() { if(capSupply == null) { return 0; } return capSupply.stored; } - public int getMaxPowerInCapacitorBanks() { + public long getMaxPowerInCapacitorBanks() { if(capSupply == null) { return 0; } @@ -301,8 +301,8 @@ public class NetworkPowerManager { storageReceptors.clear(); for (ReceptorEntry rec : network.getPowerReceptors()) { if(rec.powerInterface.getDelegate() != null && - rec.powerInterface.getDelegate().getClass() == TileCapacitorBank.class && - !((TileCapacitorBank) rec.powerInterface.getDelegate()).isCreative()) { + rec.powerInterface.getDelegate() instanceof IPowerStorage && + !((IPowerStorage) rec.powerInterface.getDelegate()).isCreative()) { storageReceptors.add(rec); } else { receptors.add(rec); @@ -342,11 +342,11 @@ public class NetworkPowerManager { int canExtract; int canFill; - Set capBanks = new HashSet(); + Set capBanks = new HashSet(); - float filledRatio; - int stored = 0; - int maxCap = 0; + double filledRatio; + long stored = 0; + long maxCap = 0; List enteries = new ArrayList(); @@ -361,38 +361,38 @@ public class NetworkPowerManager { stored = 0; maxCap = 0; - float toBalance = 0; - float maxToBalance = 0; + double toBalance = 0; + double maxToBalance = 0; for (ReceptorEntry rec : storageReceptors) { - TileCapacitorBank cb = (TileCapacitorBank) rec.powerInterface.getDelegate(); + IPowerStorage cb = (IPowerStorage) rec.powerInterface.getDelegate(); boolean processed = capBanks.contains(cb.getController()); if(!processed) { - stored += cb.getEnergyStored(); - maxCap += cb.getMaxEnergyStored(); + stored += cb.getEnergyStoredL(); + maxCap += cb.getMaxEnergyStoredL(); capBanks.add(cb.getController()); } if(rec.emmiter.getConnectionMode(rec.direction) == ConnectionMode.IN_OUT) { - toBalance += cb.getEnergyStored(); - maxToBalance += cb.getMaxEnergyStored(); + toBalance += cb.getEnergyStoredL(); + maxToBalance += cb.getMaxEnergyStoredL(); } - int canGet = 0; + long canGet = 0; if(cb.isOutputEnabled(rec.direction.getOpposite())) { - canGet = Math.min(cb.getEnergyStored(), cb.getMaxOutput()); + canGet = Math.min(cb.getEnergyStoredL(), cb.getMaxOutput()); canGet = Math.min(canGet, rec.emmiter.getMaxEnergyRecieved(rec.direction)); canExtract += canGet; } - int canFill = 0; + long canFill = 0; if(cb.isInputEnabled(rec.direction.getOpposite())) { - canFill = Math.min(cb.getMaxEnergyStored() - cb.getEnergyStored(), cb.getMaxInput()); + canFill = Math.min(cb.getMaxEnergyStoredL() - cb.getEnergyStoredL(), cb.getMaxInput()); canFill = Math.min(canFill, rec.emmiter.getMaxEnergyExtracted(rec.direction)); this.canFill += canFill; } - enteries.add(new CapBankSupplyEntry(cb, canGet, canFill, rec.emmiter, rec.direction)); + enteries.add(new CapBankSupplyEntry(cb, (int) canGet, (int) canFill, rec.emmiter, rec.direction)); } @@ -452,11 +452,11 @@ public class NetworkPowerManager { double ratio = (double) amount / canExtract; for (CapBankSupplyEntry entry : enteries) { - int use = (int) Math.ceil(ratio * entry.canExtract); + long use = (int) Math.ceil(ratio * entry.canExtract); use = Math.min(use, amount); use = Math.min(use, entry.canExtract); - entry.capBank.addEnergy(-use); - trackerRecieve(entry.emmiter, use, true); + entry.capBank.addEnergy((int) -use); + trackerRecieve(entry.emmiter, (int) use, true); amount -= use; if(amount == 0) { return; @@ -471,11 +471,11 @@ public class NetworkPowerManager { double ratio = (double) amount / canFill; for (CapBankSupplyEntry entry : enteries) { - int add = (int) Math.ceil(ratio * entry.canFill); + long add = (int) Math.ceil(ratio * entry.canFill); add = Math.min(add, entry.canFill); add = Math.min(add, amount); - entry.capBank.addEnergy(add); - trackerSend(entry.emmiter, add, true); + entry.capBank.addEnergy((int) add); + trackerSend(entry.emmiter, (int) add, true); amount -= add; if(amount == 0) { return; @@ -487,14 +487,14 @@ public class NetworkPowerManager { private static class CapBankSupplyEntry { - final TileCapacitorBank capBank; + final IPowerStorage capBank; final int canExtract; final int canFill; int toBalance; IPowerConduit emmiter; ForgeDirection direction; - private CapBankSupplyEntry(TileCapacitorBank capBank, int available, int canFill, IPowerConduit emmiter, ForgeDirection direction) { + private CapBankSupplyEntry(IPowerStorage capBank, int available, int canFill, IPowerConduit emmiter, ForgeDirection direction) { this.capBank = capBank; canExtract = available; this.canFill = canFill; @@ -502,13 +502,13 @@ public class NetworkPowerManager { this.direction = direction; } - void calcToBalance(float targetRatio) { - int targetAmount = (int) Math.floor(capBank.getMaxEnergyStored() * targetRatio); - toBalance = targetAmount - capBank.getEnergyStored(); - if(toBalance < 0) { - toBalance = Math.max(toBalance, -canExtract); + void calcToBalance(double targetRatio) { + long targetAmount = (long) Math.floor(capBank.getMaxEnergyStoredL() * targetRatio); + long b = targetAmount - capBank.getEnergyStoredL(); + if(b < 0) { + toBalance = -canExtract; } else { - toBalance = Math.min(toBalance, canFill); + toBalance = canFill; } } diff --git a/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java index e7701dbb..1e59e19c 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java @@ -441,15 +441,15 @@ public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTool if(TooltipAddera.showAdvancedTooltips()) { tooltip.add(String.format("%s : %s%s%sRF/t ", Lang.localize("capbank.maxIO"), format, fmt.format(nw.getMaxIO()), Util.TAB + Util.ALIGNRIGHT)); tooltip - .add(String.format("%s : %s%s%sRF/t ", Lang.localize("capbank.maxIn"), format, fmt.format(nw.getMaxEnergyRecieved()), Util.TAB + Util.ALIGNRIGHT)); + .add(String.format("%s : %s%s%sRF/t ", Lang.localize("capbank.maxIn"), format, fmt.format(nw.getMaxInput()), Util.TAB + Util.ALIGNRIGHT)); tooltip - .add(String.format("%s : %s%s%sRF/t ", Lang.localize("capbank.maxOut"), format, fmt.format(nw.getMaxEnergySent()), Util.TAB + Util.ALIGNRIGHT)); + .add(String.format("%s : %s%s%sRF/t ", Lang.localize("capbank.maxOut"), format, fmt.format(nw.getMaxOutput()), Util.TAB + Util.ALIGNRIGHT)); tooltip.add(""); } - long stored = nw.getEnergyStored(); - long max = nw.getMaxEnergyStored(); + long stored = nw.getEnergyStoredL(); + long max = nw.getMaxEnergyStoredL(); tooltip.add(String.format("%s%s%s / %s%s%s RF", EnumChatFormatting.WHITE, fmt.format(stored), EnumChatFormatting.RESET, EnumChatFormatting.WHITE, fmt.format(max), EnumChatFormatting.RESET)); diff --git a/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java index 09c60a2e..0fb2ff69 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java @@ -94,8 +94,8 @@ public class GuiCapBank extends GuiContainerBase { @Override protected void updateText() { text.clear(); - text.add(PowerDisplayUtil.formatPower(network.getEnergyStored()) + " " + PowerDisplayUtil.ofStr()); - text.add(EnumChatFormatting.WHITE + PowerDisplayUtil.formatPower(network.getMaxEnergyStored()) + " " + EnumChatFormatting.GRAY + text.add(PowerDisplayUtil.formatPower(network.getEnergyStoredL()) + " " + PowerDisplayUtil.ofStr()); + text.add(EnumChatFormatting.WHITE + PowerDisplayUtil.formatPower(network.getMaxEnergyStoredL()) + " " + EnumChatFormatting.GRAY + PowerDisplayUtil.abrevation()); float change = network.getAverageChangePerTick(); @@ -234,27 +234,27 @@ public class GuiCapBank extends GuiContainerBase { private void updateInputOutput() { int input = parsePower(maxInputTF); - if(input >= 0 && network.getMaxEnergyRecieved() != input) { + if(input >= 0 && network.getMaxInput() != input) { setMaxInput(input); } int output = parsePower(maxOutputTF); - if(output >= 0 && network.getMaxEnergySent() != output) { + if(output >= 0 && network.getMaxOutput() != output) { setMaxOutput(output); } } private void setMaxOutput(int output) { - if(output != network.getMaxEnergySent()) { - network.setMaxEnergySend(output); - maxOutputTF.setText(PowerDisplayUtil.formatPower(network.getMaxEnergySent())); + if(output != network.getMaxOutput()) { + network.setMaxOutput(output); + maxOutputTF.setText(PowerDisplayUtil.formatPower(network.getMaxOutput())); sendUpdateToServer(); } } private void setMaxInput(int input) { - if(input != network.getMaxEnergyRecieved()) { - network.setMaxEnergyReccieved(input); - maxInputTF.setText(PowerDisplayUtil.formatPower(network.getMaxEnergyRecieved())); + if(input != network.getMaxInput()) { + network.setMaxInput(input); + maxInputTF.setText(PowerDisplayUtil.formatPower(network.getMaxInput())); sendUpdateToServer(); } } @@ -414,8 +414,8 @@ public class GuiCapBank extends GuiContainerBase { } private void updateFieldsFromState() { - maxInputTF.setText(PowerDisplayUtil.formatPower(network.getMaxEnergyRecieved())); - maxOutputTF.setText(PowerDisplayUtil.formatPower(network.getMaxEnergySent())); + maxInputTF.setText(PowerDisplayUtil.formatPower(network.getMaxInput())); + maxOutputTF.setText(PowerDisplayUtil.formatPower(network.getMaxOutput())); inputRsButton.setMode(network.getInputControlMode()); outputRsButton.setMode(network.getOutputControlMode()); } diff --git a/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java index 956d56f8..ab83fbdf 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java @@ -34,13 +34,14 @@ import crazypants.enderio.machine.capbank.packet.PacketNetworkIdRequest; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.IInternalPowerReceptor; import crazypants.enderio.power.IPowerInterface; +import crazypants.enderio.power.IPowerStorage; import crazypants.enderio.power.PowerHandlerUtil; import crazypants.util.BlockCoord; import crazypants.util.EntityUtil; import crazypants.util.Util; import crazypants.vecmath.Vector3d; -public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor, IInventory, IIoConfigurable { +public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor, IInventory, IIoConfigurable, IPowerStorage { private Map faceModes; @@ -300,6 +301,58 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor //----------- Power + @Override + public IPowerStorage getController() { + return network; + } + + @Override + public long getEnergyStoredL() { + if(network == null) { + return getEnergyStored(); + } + return network.getEnergyStoredL(); + } + + @Override + public long getMaxEnergyStoredL() { + if(network == null) { + return getMaxEnergyStored(); + } + return network.getMaxEnergyStoredL(); + } + + @Override + public boolean isOutputEnabled(ForgeDirection direction) { + IoMode mode = getIoMode(direction); + return mode == IoMode.PUSH || mode == IoMode.NONE && isOutputEnabled(); + } + + private boolean isOutputEnabled() { + if(network == null) { + return true; + } + return network.isOutputEnabled(); + } + + @Override + public boolean isInputEnabled(ForgeDirection direction) { + IoMode mode = getIoMode(direction); + return mode == IoMode.PULL || mode == IoMode.NONE && isInputEnabled(); + } + + private boolean isInputEnabled() { + if(network == null) { + return true; + } + return network.isInputEnabled(); + } + + @Override + public boolean isCreative() { + return getType().isCreative(); + } + public List getReceptors() { if(receptorsDirty) { updateReceptors(); @@ -348,6 +401,7 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor } + @Override public void addEnergy(int energy) { if(network == null) { setEnergyStored(getEnergyStored() + energy); @@ -378,35 +432,41 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor @Override public int getMaxEnergyRecieved(ForgeDirection dir) { + return getMaxInput(); + } + + @Override + public int getMaxInput() { if(network == null) { return getType().getMaxIO(); } - return network.getMaxEnergyRecieved(); + return network.getMaxInput(); } - public int getMaxEnergySent() { - if(network == null) { - return getType().getMaxIO(); - } - return network.getMaxEnergySent(); - } - - public void setMaxEnergyRecieved(int maxInput) { + public void setMaxInput(int maxInput) { this.maxInput = maxInput; } - public void setMaxEnergySend(int maxOutput) { + public int getMaxInputOverride() { + return maxInput; + } + + @Override + public int getMaxOutput() { + if(network == null) { + return getType().getMaxIO(); + } + return network.getMaxOutput(); + } + + public void setMaxOutput(int maxOutput) { this.maxOutput = maxOutput; } - public int getMaxEnergySentOverride() { + public int getMaxOutputOverride() { return maxOutput; } - public int getMaxEnergyRecievedOverride() { - return maxInput; - } - @Override public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { if(network == null) { diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/CapBankClientNetwork.java b/src/main/java/crazypants/enderio/machine/capbank/network/CapBankClientNetwork.java index b75dfc57..584efc47 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/network/CapBankClientNetwork.java +++ b/src/main/java/crazypants/enderio/machine/capbank/network/CapBankClientNetwork.java @@ -7,8 +7,10 @@ import java.util.List; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.machine.capbank.TileCapBank; +import crazypants.enderio.power.IPowerStorage; import crazypants.util.BlockCoord; public class CapBankClientNetwork implements ICapBankNetwork { @@ -94,7 +96,7 @@ public class CapBankClientNetwork implements ICapBankNetwork { } @Override - public long getMaxEnergyStored() { + public long getMaxEnergyStoredL() { return maxEnergyStored; } @@ -103,35 +105,35 @@ public class CapBankClientNetwork implements ICapBankNetwork { } @Override - public long getEnergyStored() { + public long getEnergyStoredL() { return energyStored; } @Override - public int getMaxEnergySent() { + public int getMaxOutput() { return maxEnergySent; } @Override - public void setMaxEnergySend(int max) { + public void setMaxOutput(int max) { maxEnergySent = MathHelper.clamp_int(max, 0, maxIO); } @Override - public int getMaxEnergyRecieved() { + public int getMaxInput() { return maxEnergyRecieved; } @Override - public void setMaxEnergyReccieved(int max) { + public void setMaxInput(int max) { maxEnergyRecieved = MathHelper.clamp_int(max, 0, maxIO); } public double getEnergyStoredRatio() { - if(getMaxEnergyStored() <= 0) { + if(getMaxEnergyStoredL() <= 0) { return 0; } - return (double) getEnergyStored() / getMaxEnergyStored(); + return (double) getEnergyStoredL() / getMaxEnergyStoredL(); } @Override @@ -198,4 +200,34 @@ public class CapBankClientNetwork implements ICapBankNetwork { public void updateRedstoneSignal(TileCapBank tileCapBank, boolean recievingSignal) { } + @Override + public boolean isOutputEnabled() { + return true; + } + + @Override + public boolean isInputEnabled() { + return true; + } + + @Override + public IPowerStorage getController() { + return this; + } + + @Override + public boolean isOutputEnabled(ForgeDirection direction) { + return isOutputEnabled(); + } + + @Override + public boolean isInputEnabled(ForgeDirection direction) { + return isInputEnabled(); + } + + @Override + public boolean isCreative() { + return false; + } + } diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java b/src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java index 9cd70b76..6bc877f7 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java +++ b/src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java @@ -9,6 +9,7 @@ import java.util.Set; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; import cofh.api.energy.IEnergyContainerItem; import cpw.mods.fml.common.gameevent.TickEvent.ServerTickEvent; import crazypants.enderio.EnderIO; @@ -22,6 +23,7 @@ import crazypants.enderio.machine.capbank.CapBankType; import crazypants.enderio.machine.capbank.TileCapBank; import crazypants.enderio.machine.capbank.packet.PacketNetworkStateResponse; import crazypants.enderio.power.IPowerInterface; +import crazypants.enderio.power.IPowerStorage; import crazypants.enderio.power.PerTickIntAverageCalculator; import crazypants.util.BlockCoord; import crazypants.util.RoundRobinIterator; @@ -62,7 +64,7 @@ public class CapBankNetwork implements ICapBankNetwork { private TickListener tickListener; - private PerTickIntAverageCalculator powerTracker = new PerTickIntAverageCalculator(); + private PerTickIntAverageCalculator powerTracker = new PerTickIntAverageCalculator(2); private final InventoryImpl inventory = new InventoryImpl(); @@ -142,10 +144,10 @@ public class CapBankNetwork implements ICapBankNetwork { energyStored += cap.getEnergyStored(); maxEnergyStored += cap.getMaxEnergyStored(); if(maxInput == -1) { - maxInput = cap.getMaxEnergyRecievedOverride(); + maxInput = cap.getMaxInputOverride(); } if(maxOutput == -1) { - maxOutput = cap.getMaxEnergySentOverride(); + maxOutput = cap.getMaxOutputOverride(); } cap.setInputControlMode(inputControlMode); cap.setOutputControlMode(outputControlMode); @@ -226,7 +228,7 @@ public class CapBankNetwork implements ICapBankNetwork { return; } - int available = getEnergyAvailableForTick(getMaxEnergySent()); + int available = getEnergyAvailableForTick(getMaxOutput()); if(available <= 0) { return; } @@ -336,7 +338,7 @@ public class CapBankNetwork implements ICapBankNetwork { spaceAvailable = Integer.MAX_VALUE; } int res = Math.min(maxReceive, (int) spaceAvailable); - res = Math.min(maxReceive, getMaxEnergyRecieved()); + res = Math.min(maxReceive, getMaxInput()); if(!simulate) { if(!type.isCreative()) { addEnergy(res); @@ -385,12 +387,12 @@ public class CapBankNetwork implements ICapBankNetwork { } @Override - public long getEnergyStored() { + public long getEnergyStoredL() { return energyStored; } @Override - public long getMaxEnergyStored() { + public long getMaxEnergyStoredL() { return maxEnergyStored; } @@ -402,7 +404,7 @@ public class CapBankNetwork implements ICapBankNetwork { //----- IO overrides @Override - public int getMaxEnergyRecieved() { + public int getMaxInput() { if(maxInput == -1) { return maxIO; } @@ -410,7 +412,7 @@ public class CapBankNetwork implements ICapBankNetwork { } @Override - public int getMaxEnergySent() { + public int getMaxOutput() { if(maxOutput == -1) { return maxIO; } @@ -418,7 +420,7 @@ public class CapBankNetwork implements ICapBankNetwork { } @Override - public void setMaxEnergyReccieved(int max) { + public void setMaxInput(int max) { if(max >= maxIO) { maxInput = -1; } else if(max < 0) { @@ -427,12 +429,12 @@ public class CapBankNetwork implements ICapBankNetwork { maxInput = max; } for (TileCapBank cb : capBanks) { - cb.setMaxEnergyRecieved(maxInput); + cb.setMaxInput(maxInput); } } @Override - public void setMaxEnergySend(int max) { + public void setMaxOutput(int max) { if(max >= maxIO) { maxOutput = -1; } else if(max < 0) { @@ -441,7 +443,7 @@ public class CapBankNetwork implements ICapBankNetwork { maxOutput = max; } for (TileCapBank cb : capBanks) { - cb.setMaxEnergySend(maxOutput); + cb.setMaxOutput(maxOutput); } } @@ -493,6 +495,16 @@ public class CapBankNetwork implements ICapBankNetwork { updateRedstoneConditions(); } + @Override + public boolean isInputEnabled() { + return inputRedstoneConditionMet; + } + + @Override + public boolean isOutputEnabled() { + return outputRedstoneConditionMet; + } + private void updateRedstoneConditions() { int powerLevel = redstoneRecievers.isEmpty() ? 0 : 15; inputRedstoneConditionMet = RedstoneControlMode.isConditionMet(inputControlMode, powerLevel); @@ -513,4 +525,24 @@ public class CapBankNetwork implements ICapBankNetwork { } + @Override + public IPowerStorage getController() { + return this; + } + + @Override + public boolean isOutputEnabled(ForgeDirection direction) { + return isOutputEnabled(); + } + + @Override + public boolean isInputEnabled(ForgeDirection direction) { + return isInputEnabled(); + } + + @Override + public boolean isCreative() { + return type.isCreative(); + } + } diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/ICapBankNetwork.java b/src/main/java/crazypants/enderio/machine/capbank/network/ICapBankNetwork.java index 1f3bbac6..02821227 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/network/ICapBankNetwork.java +++ b/src/main/java/crazypants/enderio/machine/capbank/network/ICapBankNetwork.java @@ -5,8 +5,9 @@ import java.util.List; import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.machine.capbank.TileCapBank; +import crazypants.enderio.power.IPowerStorage; -public interface ICapBankNetwork { +public interface ICapBankNetwork extends IPowerStorage { //------ Network @@ -25,23 +26,30 @@ public interface ICapBankNetwork { //------ Energy - long getEnergyStored(); + @Override + long getEnergyStoredL(); + @Override void addEnergy(int energy); int recieveEnergy(int maxReceive, boolean simulate); - long getMaxEnergyStored(); + @Override + long getMaxEnergyStoredL(); int getMaxIO(); - int getMaxEnergySent(); + @Override + int getMaxOutput(); - void setMaxEnergySend(int max); + void setMaxOutput(int max); - int getMaxEnergyRecieved(); + @Override + int getMaxInput(); - void setMaxEnergyReccieved(int max); + void setMaxInput(int max); + + float getAverageChangePerTick(); void removeReceptors(Collection receptors); @@ -65,7 +73,9 @@ public interface ICapBankNetwork { void updateRedstoneSignal(TileCapBank tileCapBank, boolean recievingSignal); - public abstract float getAverageChangePerTick(); + boolean isOutputEnabled(); + + boolean isInputEnabled(); diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/NetworkState.java b/src/main/java/crazypants/enderio/machine/capbank/network/NetworkState.java index 78b7d6a1..e5c3e25f 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/network/NetworkState.java +++ b/src/main/java/crazypants/enderio/machine/capbank/network/NetworkState.java @@ -35,11 +35,11 @@ public class NetworkState { } public NetworkState(ICapBankNetwork network) { - energyStored = network.getEnergyStored(); - maxEnergyStored = network.getMaxEnergyStored(); + energyStored = network.getEnergyStoredL(); + maxEnergyStored = network.getMaxEnergyStoredL(); maxIO = network.getMaxIO(); - maxInput = network.getMaxEnergyRecieved(); - maxOutput = network.getMaxEnergySent(); + maxInput = network.getMaxInput(); + maxOutput = network.getMaxOutput(); inputMode = network.getInputControlMode(); outputMode = network.getOutputControlMode(); TileCapBank cb = network.getInventory().getCapBank(); diff --git a/src/main/java/crazypants/enderio/machine/capbank/packet/PacketGuiChange.java b/src/main/java/crazypants/enderio/machine/capbank/packet/PacketGuiChange.java index 6962a99f..3e743a6e 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/packet/PacketGuiChange.java +++ b/src/main/java/crazypants/enderio/machine/capbank/packet/PacketGuiChange.java @@ -20,8 +20,8 @@ public class PacketGuiChange extends PacketCapBank { public PacketGuiChange(TileCapBank capBank) { super(capBank); ICapBankNetwork network = capBank.getNetwork(); - maxSend = network.getMaxEnergySent(); - maxRec = network.getMaxEnergyRecieved(); + maxSend = network.getMaxOutput(); + maxRec = network.getMaxInput(); inputMode = network.getInputControlMode(); outputMode = network.getOutputControlMode(); } @@ -50,8 +50,8 @@ public class PacketGuiChange extends PacketCapBank { if(net == null) { return null; } - net.setMaxEnergySend(message.maxSend); - net.setMaxEnergyReccieved(message.maxRec); + net.setMaxOutput(message.maxSend); + net.setMaxInput(message.maxRec); net.setInputControlMode(message.inputMode); net.setOutputControlMode(message.outputMode); return null; diff --git a/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkEnergyResponse.java b/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkEnergyResponse.java index 51d83f58..15def115 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkEnergyResponse.java +++ b/src/main/java/crazypants/enderio/machine/capbank/packet/PacketNetworkEnergyResponse.java @@ -18,7 +18,7 @@ public class PacketNetworkEnergyResponse implements IMessage, IMessageHandler 0.05 || nbtRoot.hasKey("render")) { + if(maxStoredEnergy != 0 && Math.abs(oldEnergy - newEnergy) / maxStoredEnergy > 0.05 || nbtRoot.hasKey("render")) { render = true; } if(energyAtLastRender != -1 && maxStoredEnergy != 0) { @@ -1110,7 +1127,7 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe IoMode mode; private Receptor(IPowerInterface rec, ForgeDirection fromDir, IoMode mode) { - this.receptor = rec; + receptor = rec; this.fromDir = fromDir; this.mode = mode; } @@ -1129,12 +1146,13 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe } public void setCreativeMode() { - this.isCreative = true; + isCreative = true; maxIO = maxIO * 1000; maxInput = maxIO; maxOutput = maxIO; } + @Override public boolean isCreative() { return isCreative; } diff --git a/src/main/java/crazypants/enderio/power/IPowerStorage.java b/src/main/java/crazypants/enderio/power/IPowerStorage.java new file mode 100644 index 00000000..dde90d3c --- /dev/null +++ b/src/main/java/crazypants/enderio/power/IPowerStorage.java @@ -0,0 +1,25 @@ +package crazypants.enderio.power; + +import net.minecraftforge.common.util.ForgeDirection; + +public interface IPowerStorage { + + IPowerStorage getController(); + + long getEnergyStoredL(); + + long getMaxEnergyStoredL(); + + boolean isOutputEnabled(ForgeDirection direction); + + boolean isInputEnabled(ForgeDirection direction); + + int getMaxOutput(); + + int getMaxInput(); + + void addEnergy(int amount); + + boolean isCreative(); + +} From c55a5b82094bdc1949729af3080a9ea1b33caa92 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Fri, 5 Dec 2014 20:07:11 +0800 Subject: [PATCH 08/12] New 'fill bar' rendering done. --- .../assets/enderio/textures/blocks/blank.png | Bin 0 -> 199 bytes .../java/crazypants/enderio/ClientProxy.java | 4 +- .../item/darksteel/ItemDarkSteelSword.java | 3 + .../enderio/machine/capbank/BlockCapBank.java | 73 +++-- .../machine/capbank/CapBankRenderer.java | 104 ------- .../enderio/machine/capbank/CapBankType.java | 1 - .../enderio/machine/capbank/GuiCapBank.java | 3 +- .../machine/capbank/InfoDisplayType.java | 18 ++ .../enderio/machine/capbank/TileCapBank.java | 163 +++++++++- .../capbank/network/CapBankClientNetwork.java | 13 + .../capbank/network/CapBankNetwork.java | 12 +- .../capbank/render/CapBankRenderer.java | 205 +++++++++++++ .../machine/capbank/render/FillGauge.java | 288 ++++++++++++++++++ src/main/java/crazypants/render/IconUtil.java | 1 + 14 files changed, 745 insertions(+), 143 deletions(-) create mode 100644 resources/assets/enderio/textures/blocks/blank.png delete mode 100644 src/main/java/crazypants/enderio/machine/capbank/CapBankRenderer.java create mode 100644 src/main/java/crazypants/enderio/machine/capbank/InfoDisplayType.java create mode 100644 src/main/java/crazypants/enderio/machine/capbank/render/CapBankRenderer.java create mode 100644 src/main/java/crazypants/enderio/machine/capbank/render/FillGauge.java diff --git a/resources/assets/enderio/textures/blocks/blank.png b/resources/assets/enderio/textures/blocks/blank.png new file mode 100644 index 0000000000000000000000000000000000000000..06776a05bc52accdc9d7a73fd446d9f9d7d6f5f6 GIT binary patch literal 199 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0figD*u3fvU_rT^vI!{Fk2CD9E6|z^wQ^-b&Bm;e1x!^xNWT2X$t!ZcY$8(-djI fjo|#ud(L!p?O*v9eW%|6ObP0l+XkKr stack.getTagCompound().getCompoundTag("InfiTool").getInteger("Beheading") + if(evt.entityLiving instanceof EntitySkeleton && ((EntitySkeleton) evt.entityLiving).getSkeletonType() == 1) { if(isEquippedAndPowered(player, Config.darkSteelSwordPowerUsePerHit)) { return Config.darkSteelSwordWitherSkullChance + (Config.darkSteelSwordWitherSkullLootingModifier * evt.lootingLevel); diff --git a/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java index 1e59e19c..1f17649b 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java @@ -32,6 +32,7 @@ import crazypants.enderio.ModObject; import crazypants.enderio.gui.IAdvancedTooltipProvider; import crazypants.enderio.gui.TooltipAddera; import crazypants.enderio.machine.IoMode; +import crazypants.enderio.machine.capbank.network.CapBankClientNetwork; import crazypants.enderio.machine.capbank.network.ICapBankNetwork; import crazypants.enderio.machine.capbank.packet.PacketGuiChange; import crazypants.enderio.machine.capbank.packet.PacketNetworkEnergyRequest; @@ -69,9 +70,9 @@ public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTool } @SideOnly(Side.CLIENT) - IIcon overlayIcon; + private IIcon gaugeIcon; @SideOnly(Side.CLIENT) - IIcon fillBarIcon; + private IIcon fillBarIcon; @SideOnly(Side.CLIENT) private IIcon[] blockIcons; @@ -141,23 +142,50 @@ public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTool @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float par7, float par8, float par9) { + TileEntity te = world.getTileEntity(x, y, z); + if(!(te instanceof TileCapBank)) { + return false; + } + if(ToolUtil.breakBlockWithTool(this, world, x, y, z, entityPlayer)) { return true; } + TileCapBank tcb = (TileCapBank) te; + ForgeDirection faceHit = ForgeDirection.getOrientation(side); + + if(entityPlayer.isSneaking() && entityPlayer.getCurrentEquippedItem() == null && faceHit.offsetY == 0) { + InfoDisplayType newDisplayType = tcb.getDisplayType(faceHit).next(); + if(newDisplayType == InfoDisplayType.NONE) { + tcb.setDefaultIoMode(faceHit); + } else { + tcb.setIoMode(faceHit, IoMode.DISABLED); + } + tcb.setDisplayType(faceHit, newDisplayType); + return true; + } + if(entityPlayer.isSneaking()) { return false; } - TileEntity te = world.getTileEntity(x, y, z); - if(!(te instanceof TileCapBank)) { - return false; - } if(ToolUtil.isToolEquipped(entityPlayer)) { - ForgeDirection faceHit = ForgeDirection.getOrientation(side); - TileCapBank tcb = (TileCapBank) te; - tcb.toggleIoModeForFace(faceHit); + IoMode ioMode = tcb.getIoMode(faceHit); + if(faceHit.offsetY == 0) { + if(ioMode == IoMode.DISABLED) { + InfoDisplayType newDisplayType = tcb.getDisplayType(faceHit).next(); + tcb.setDisplayType(faceHit, newDisplayType); + if(newDisplayType == InfoDisplayType.NONE) { + tcb.setDefaultIoMode(faceHit); + } + } else { + tcb.toggleIoModeForFace(faceHit); + } + } else { + tcb.toggleIoModeForFace(faceHit); + } + if(world.isRemote) { world.markBlockForUpdate(x, y, z); } else { @@ -196,7 +224,7 @@ public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTool @Override public void registerBlockIcons(IIconRegister IIconRegister) { blockIcon = IIconRegister.registerIcon("enderio:capacitorBank"); - overlayIcon = IIconRegister.registerIcon("enderio:capacitorBankOverlays"); + gaugeIcon = IIconRegister.registerIcon("enderio:capacitorBankOverlays"); fillBarIcon = IIconRegister.registerIcon("enderio:capacitorBankFillBar"); blockIcons = new IIcon[CapBankType.types().size()]; @@ -208,11 +236,9 @@ public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTool for (CapBankType type : CapBankType.types()) { blockIcons[index] = IIconRegister.registerIcon(type.getIcon()); borderIcons[index] = IIconRegister.registerIcon(type.getBorderIcon()); - inputIcons[index] = IIconRegister.registerIcon(type.getInputIcon()); outputIcons[index] = IIconRegister.registerIcon(type.getOutputIcon()); lockedIcons[index] = IIconRegister.registerIcon(type.getLockedIcon()); - ++index; } @@ -264,12 +290,14 @@ public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTool if(!(te instanceof TileCapBank)) { return blockIcons[0]; } + TileCapBank cb = (TileCapBank) te; + ForgeDirection face = ForgeDirection.values()[side]; + int meta = ba.getBlockMetadata(x, y, z); meta = MathHelper.clamp_int(meta, 0, CapBankType.types().size() - 1); - TileCapBank cb = (TileCapBank) te; - IoMode mode = cb.getIoMode(ForgeDirection.values()[side]); - if(mode == null || mode == IoMode.NONE) { + IoMode mode = cb.getIoMode(face); + if(mode == null || mode == IoMode.NONE || cb.getDisplayType(face) != InfoDisplayType.NONE) { return blockIcons[meta]; } if(mode == IoMode.PULL) { @@ -281,6 +309,14 @@ public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTool return lockedIcons[meta]; } + public IIcon getGaugeIcon() { + return gaugeIcon; + } + + public IIcon getFillBarIcon() { + return fillBarIcon; + } + @Override public void onNeighborBlockChange(World world, int x, int y, int z, Block blockId) { if(world.isRemote) { @@ -432,10 +468,11 @@ public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTool if(cap.getNetwork() != null) { if(world.isRemote && world.getTotalWorldTime() % 20 == 0) { PacketHandler.INSTANCE.sendToServer(new PacketNetworkStateRequest(cap)); - } else if(world.isRemote && world.getTotalWorldTime() % 2 == 0) { - PacketHandler.INSTANCE.sendToServer(new PacketNetworkEnergyRequest(cap)); } ICapBankNetwork nw = cap.getNetwork(); + if(world.isRemote) { + ((CapBankClientNetwork) nw).requestPowerUpdate(cap, 2); + } String format = Util.TAB + Util.ALIGNRIGHT + EnumChatFormatting.WHITE; if(TooltipAddera.showAdvancedTooltips()) { @@ -464,8 +501,6 @@ public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTool tooltip .add(String.format("%s%s%sRF/t ", color, fmt.format(change), " " + EnumChatFormatting.RESET.toString())); - - } } } diff --git a/src/main/java/crazypants/enderio/machine/capbank/CapBankRenderer.java b/src/main/java/crazypants/enderio/machine/capbank/CapBankRenderer.java deleted file mode 100644 index 06ec72c8..00000000 --- a/src/main/java/crazypants/enderio/machine/capbank/CapBankRenderer.java +++ /dev/null @@ -1,104 +0,0 @@ -package crazypants.enderio.machine.capbank; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; -import net.minecraft.world.IBlockAccess; -import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.common.util.ForgeDirection; - -import org.lwjgl.opengl.GL11; - -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import crazypants.enderio.EnderIO; -import crazypants.render.ConnectedTextureRenderer; -import crazypants.render.CubeRenderer; -import crazypants.render.CustomCubeRenderer; -import crazypants.render.RenderUtil; - -public class CapBankRenderer implements ISimpleBlockRenderingHandler, IItemRenderer { - - private ConnectedTextureRenderer connectedTexRenderer; - - public CapBankRenderer() { - connectedTexRenderer = new ConnectedTextureRenderer(); - connectedTexRenderer.setMatchMeta(true); - } - - //------- Block - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { - } - - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - - int meta = world.getBlockMetadata(x, y, z); - meta = MathHelper.clamp_int(meta, 0, CapBankType.types().size() - 1); - CapBankType type = CapBankType.getTypeFromMeta(meta); - if(!type.isMultiblock()) { - connectedTexRenderer.setForceAllEdges(true); - } else { - connectedTexRenderer.setForceAllEdges(false); - } - connectedTexRenderer.setEdgeTexture(EnderIO.blockCapBank.getBorderIcon(0, meta)); - CustomCubeRenderer.instance.renderBlock(world, block, x, y, z, connectedTexRenderer); - return true; - } - - @Override - public boolean shouldRender3DInInventory(int modelId) { - return true; - } - - @Override - public int getRenderId() { - return BlockCapBank.renderId; - } - - //------- Item - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - return true; - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return true; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - - RenderUtil.bindBlockTexture(); - Tessellator tes = Tessellator.instance; - - tes.startDrawingQuads(); - CubeRenderer.render(EnderIO.blockCapBank, item.getItemDamage()); - tes.draw(); - - GL11.glEnable(GL11.GL_POLYGON_OFFSET_FILL); - GL11.glPolygonOffset(-1.0f, -1.0f); - - tes.startDrawingQuads(); - tes.setColorRGBA_F(1, 1, 1, 1); - renderBorder(null, 0, 0, 0, item.getItemDamage()); - tes.draw(); - - GL11.glDisable(GL11.GL_POLYGON_OFFSET_FILL); - - } - - private void renderBorder(IBlockAccess blockAccess, int x, int y, int z, int meta) { - IIcon texture = EnderIO.blockCapBank.getBorderIcon(0, meta); - for (ForgeDirection face : ForgeDirection.VALID_DIRECTIONS) { - RenderUtil.renderConnectedTextureFace(blockAccess, x, y, z, face, texture, - blockAccess == null, false, false); - } - } - -} diff --git a/src/main/java/crazypants/enderio/machine/capbank/CapBankType.java b/src/main/java/crazypants/enderio/machine/capbank/CapBankType.java index 98663623..eae9f00a 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/CapBankType.java +++ b/src/main/java/crazypants/enderio/machine/capbank/CapBankType.java @@ -9,7 +9,6 @@ import crazypants.enderio.config.Config; public class CapBankType { - private static final CapBankType CREATIVE = new CapBankType("CREATIVE", "tile.blockCapBank.creative", 500000, Config.capacitorBankMaxStorageRF, false, true, "enderio:capacitorBank", "enderio:capacitorBankCreativeBorder", "enderio:capacitorBankInput", "enderio:capacitorBankOutput", "enderio:capacitorBankLocked"); diff --git a/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java index 0fb2ff69..dec240a9 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java @@ -26,7 +26,6 @@ import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.machine.capbank.network.CapBankClientNetwork; import crazypants.enderio.machine.capbank.network.NetworkState; import crazypants.enderio.machine.capbank.packet.PacketGuiChange; -import crazypants.enderio.machine.capbank.packet.PacketNetworkEnergyRequest; import crazypants.enderio.machine.capbank.packet.PacketNetworkStateRequest; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.network.PacketHandler; @@ -380,7 +379,7 @@ public class GuiCapBank extends GuiContainerBase { private void requestStateUpdate() { if(EnderIO.proxy.getTickCount() % 2 == 0) { if(!updateState()) { - PacketHandler.INSTANCE.sendToServer(new PacketNetworkEnergyRequest(capBank)); + network.requestPowerUpdate(capBank, 2); } } } diff --git a/src/main/java/crazypants/enderio/machine/capbank/InfoDisplayType.java b/src/main/java/crazypants/enderio/machine/capbank/InfoDisplayType.java new file mode 100644 index 00000000..b8f464ec --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/capbank/InfoDisplayType.java @@ -0,0 +1,18 @@ +package crazypants.enderio.machine.capbank; + + +public enum InfoDisplayType { + + NONE, + LEVEL_BAR; + + public InfoDisplayType next() { + int ord = ordinal(); + ++ord; + if(ord >= values().length) { + ord = 0; + } + return values()[ord]; + } + +} diff --git a/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java index ab83fbdf..d67d81ad 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java @@ -2,6 +2,7 @@ package crazypants.enderio.machine.capbank; import java.util.ArrayList; import java.util.EnumMap; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -44,6 +45,7 @@ import crazypants.vecmath.Vector3d; public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor, IInventory, IIoConfigurable, IPowerStorage { private Map faceModes; + private Map faceDisplayTypes; private CapBankType type; @@ -73,6 +75,8 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor private int idRequestTimer = 0; private boolean dropItems; + private boolean displayTypesDirty; + private boolean revalidateDisplayTypes; @Override public BlockCoord getLocation() { @@ -89,6 +93,7 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor public void onNeighborBlockChange(Block blockId) { redstoneStateDirty = true; receptorsDirty = true; + revalidateDisplayTypes = true; } //---------- Multiblock @@ -186,6 +191,15 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor if(receptorsDirty) { updateReceptors(); } + if(revalidateDisplayTypes) { + checkDisplayTypesValid(); + revalidateDisplayTypes = false; + } + if(displayTypesDirty) { + displayTypesDirty = false; + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + + } doDropItems(); } @@ -255,6 +269,19 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor } } + public void setDefaultIoMode(ForgeDirection faceHit) { + EnergyReceptor er = getEnergyReceptorForFace(faceHit); + if(er == null || er.getConduit() != null) { + setIoMode(faceHit, IoMode.NONE); + } else if(er.getReceptor().isInputOnly()) { + setIoMode(faceHit, IoMode.PUSH); + } else if(er.getReceptor().isOutputOnly()) { + setIoMode(faceHit, IoMode.PULL); + } else { + setIoMode(faceHit, IoMode.PUSH); + } + } + @Override public IoMode getIoMode(ForgeDirection face) { if(faceModes == null) { @@ -267,22 +294,77 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor return res; } - private IPowerInterface getReceptorForFace(ForgeDirection faceHit) { - BlockCoord checkLoc = new BlockCoord(this).getLocation(faceHit); - TileEntity te = worldObj.getTileEntity(checkLoc.x, checkLoc.y, checkLoc.z); - if(!(te instanceof TileCapBank)) { - return PowerHandlerUtil.create(te); - } else { - TileCapBank other = (TileCapBank) te; - if(other.getType() != getType()) { - return PowerHandlerUtil.create(te); - } + //----- Info Display + + public InfoDisplayType getDisplayType(ForgeDirection face) { + if(faceDisplayTypes == null) { + return InfoDisplayType.NONE; } - return null; + InfoDisplayType res = faceDisplayTypes.get(face); + return res == null ? InfoDisplayType.NONE : res; } + public void setDisplayType(ForgeDirection face, InfoDisplayType type) { + setDisplayType(face, type, true); + } + + public void setDisplayType(ForgeDirection face, InfoDisplayType type, boolean markDirty) { + if(type == null) { + type = InfoDisplayType.NONE; + } + if(faceDisplayTypes == null && type == InfoDisplayType.NONE) { + return; + } + InfoDisplayType cur = getDisplayType(face); + if(cur == type) { + return; + } + + if(faceDisplayTypes == null) { + faceDisplayTypes = new HashMap(); + } + + if(type == InfoDisplayType.NONE) { + faceDisplayTypes.remove(face); + } else { + faceDisplayTypes.put(face, type); + } + + if(faceDisplayTypes.isEmpty()) { + faceDisplayTypes = null; + } + displayTypesDirty = markDirty; + } + + private void checkDisplayTypesValid() { + if(faceDisplayTypes == null) { + return; + } + List reset = new ArrayList(); + for (Entry entry : faceDisplayTypes.entrySet()) { + BlockCoord bc = getLocation().getLocation(entry.getKey()); + Block block = worldObj.getBlock(bc.x, bc.y, bc.z); + if(block != null && block.isOpaqueCube()) { + reset.add(entry.getKey()); + } + } + for (ForgeDirection dir : reset) { + setDisplayType(dir, InfoDisplayType.NONE); + setDefaultIoMode(dir); + } + } + + //----------- Redstone + @Override + public boolean shouldRenderInPass(int pass) { + if(faceDisplayTypes == null) { + return false; + } + return pass == 0; + } + public RedstoneControlMode getInputControlMode() { return inputControlMode; } @@ -384,9 +466,31 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor receptorsDirty = false; } + private IPowerInterface getReceptorForFace(ForgeDirection faceHit) { + BlockCoord checkLoc = new BlockCoord(this).getLocation(faceHit); + TileEntity te = worldObj.getTileEntity(checkLoc.x, checkLoc.y, checkLoc.z); + if(!(te instanceof TileCapBank)) { + return PowerHandlerUtil.create(te); + } else { + TileCapBank other = (TileCapBank) te; + if(other.getType() != getType()) { + return PowerHandlerUtil.create(te); + } + } + return null; + } + + private EnergyReceptor getEnergyReceptorForFace(ForgeDirection dir) { + IPowerInterface pi = getReceptorForFace(dir); + if(pi == null || pi.getDelegate() instanceof TileCapBank) { + return null; + } + return new EnergyReceptor(this, pi, dir); + } + private void validateModeForReceptor(EnergyReceptor er) { IoMode ioMode = getIoMode(er.getDir()); - if(ioMode == IoMode.PUSH_PULL && er.getConduit() == null) { + if((ioMode == IoMode.PUSH_PULL || ioMode == IoMode.NONE) && er.getConduit() == null) { if(er.getReceptor().isOutputOnly()) { setIoMode(er.getDir(), IoMode.PULL, false); } else { @@ -634,16 +738,30 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor } } + //display type + if(faceDisplayTypes != null) { + nbtRoot.setByte("hasDisplayTypes", (byte) 1); + for (Entry e : faceDisplayTypes.entrySet()) { + if(e.getValue() != InfoDisplayType.NONE) { + nbtRoot.setShort("faceDisplay" + e.getKey().ordinal(), (short) e.getValue().ordinal()); + } + } + } + + boolean hasItems = false; NBTTagList itemList = new NBTTagList(); for (int i = 0; i < inventory.length; i++) { if(inventory[i] != null) { + hasItems = true; NBTTagCompound itemStackNBT = new NBTTagCompound(); itemStackNBT.setByte("Slot", (byte) i); inventory[i].writeToNBT(itemStackNBT); itemList.appendTag(itemStackNBT); } } - nbtRoot.setTag("Items", itemList); + if(hasItems) { + nbtRoot.setTag("Items", itemList); + } } @Override @@ -655,6 +773,7 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor public void readCommonNBT(NBTTagCompound nbtRoot) { type = CapBankType.readTypeFromNBT(nbtRoot); energyStored = nbtRoot.getInteger(PowerHandlerUtil.STORED_ENERGY_NBT_KEY); + setEnergyStored(energyStored); //Call this to clamp values in case config changed if(nbtRoot.hasKey("maxInput")) { maxInput = nbtRoot.getInteger("maxInput"); @@ -680,10 +799,24 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor if(nbtRoot.hasKey("hasFaces")) { for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - if(nbtRoot.hasKey("face" + dir.ordinal())) { - setIoMode(dir, IoMode.values()[nbtRoot.getShort("face" + dir.ordinal())], false); + String key = "face" + dir.ordinal(); + if(nbtRoot.hasKey(key)) { + setIoMode(dir, IoMode.values()[nbtRoot.getShort(key)], false); } } + } else { + faceModes = null; + } + + if(nbtRoot.hasKey("hasDisplayTypes")) { + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + String key = "faceDisplay" + dir.ordinal(); + if(nbtRoot.hasKey(key)) { + setDisplayType(dir, InfoDisplayType.values()[nbtRoot.getShort(key)], false); + } + } + } else { + faceDisplayTypes = null; } for (int i = 0; i < inventory.length; i++) { diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/CapBankClientNetwork.java b/src/main/java/crazypants/enderio/machine/capbank/network/CapBankClientNetwork.java index 584efc47..840d542e 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/network/CapBankClientNetwork.java +++ b/src/main/java/crazypants/enderio/machine/capbank/network/CapBankClientNetwork.java @@ -8,8 +8,11 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import crazypants.enderio.EnderIO; import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.machine.capbank.TileCapBank; +import crazypants.enderio.machine.capbank.packet.PacketNetworkEnergyRequest; +import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.IPowerStorage; import crazypants.util.BlockCoord; @@ -32,6 +35,8 @@ public class CapBankClientNetwork implements ICapBankNetwork { private float aveChange; + private long lastPowerRequestTick = -1; + public CapBankClientNetwork(int id) { this.id = id; } @@ -41,6 +46,14 @@ public class CapBankClientNetwork implements ICapBankNetwork { return id; } + public void requestPowerUpdate(TileCapBank capBank, int interval) { + long curTick = EnderIO.proxy.getTickCount(); + if(lastPowerRequestTick == -1 || curTick - lastPowerRequestTick >= interval) { + PacketHandler.INSTANCE.sendToServer(new PacketNetworkEnergyRequest(capBank)); + lastPowerRequestTick = curTick; + } + } + public void setState(World world, NetworkState state) { maxEnergyRecieved = state.getMaxInput(); maxEnergySent = state.getMaxOutput(); diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java b/src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java index 6bc877f7..c5981194 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java +++ b/src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java @@ -21,6 +21,7 @@ import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.machine.capbank.CapBankType; import crazypants.enderio.machine.capbank.TileCapBank; +import crazypants.enderio.machine.capbank.packet.PacketNetworkEnergyResponse; import crazypants.enderio.machine.capbank.packet.PacketNetworkStateResponse; import crazypants.enderio.power.IPowerInterface; import crazypants.enderio.power.IPowerStorage; @@ -68,6 +69,8 @@ public class CapBankNetwork implements ICapBankNetwork { private final InventoryImpl inventory = new InventoryImpl(); + private boolean firstUpate = true; + public CapBankNetwork(int id) { this.id = id; } @@ -91,7 +94,6 @@ public class CapBankNetwork implements ICapBankNetwork { } } setNetwork(world, cap); - EnderIO.packetPipeline.sendToAllAround(new PacketNetworkStateResponse(this), cap); } @@ -216,6 +218,14 @@ public class CapBankNetwork implements ICapBankNetwork { } prevEnergyStored = energyStored; + if(firstUpate) { + if(!capBanks.isEmpty()) { + EnderIO.packetPipeline.sendToAllAround(new PacketNetworkStateResponse(this), capBanks.get(0)); + EnderIO.packetPipeline.sendToAllAround(new PacketNetworkEnergyResponse(this), capBanks.get(0)); + } + firstUpate = false; + } + } private void transmitEnergy() { diff --git a/src/main/java/crazypants/enderio/machine/capbank/render/CapBankRenderer.java b/src/main/java/crazypants/enderio/machine/capbank/render/CapBankRenderer.java new file mode 100644 index 00000000..5f46f163 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/capbank/render/CapBankRenderer.java @@ -0,0 +1,205 @@ +package crazypants.enderio.machine.capbank.render; + +import net.minecraft.block.Block; +import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +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.minecraftforge.client.IItemRenderer; +import net.minecraftforge.common.util.ForgeDirection; + +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import crazypants.enderio.EnderIO; +import crazypants.enderio.machine.capbank.BlockCapBank; +import crazypants.enderio.machine.capbank.CapBankType; +import crazypants.enderio.machine.capbank.InfoDisplayType; +import crazypants.enderio.machine.capbank.TileCapBank; +import crazypants.enderio.machine.capbank.network.CapBankClientNetwork; +import crazypants.render.BoundingBox; +import crazypants.render.ConnectedTextureRenderer; +import crazypants.render.CubeRenderer; +import crazypants.render.CustomCubeRenderer; +import crazypants.render.RenderUtil; +import crazypants.util.ForgeDirectionOffsets; +import crazypants.vecmath.Vector3d; + +public class CapBankRenderer extends TileEntitySpecialRenderer implements ISimpleBlockRenderingHandler, IItemRenderer { + + private ConnectedTextureRenderer connectedTexRenderer; + private FillGauge fillGauge; + + public CapBankRenderer() { + connectedTexRenderer = new ConnectedTextureRenderer(); + connectedTexRenderer.setMatchMeta(true); + fillGauge = new FillGauge(); + } + + //------- Block + + @Override + public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { + } + + @Override + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + + int meta = world.getBlockMetadata(x, y, z); + meta = MathHelper.clamp_int(meta, 0, CapBankType.types().size() - 1); + CapBankType type = CapBankType.getTypeFromMeta(meta); + if(!type.isMultiblock()) { + connectedTexRenderer.setForceAllEdges(true); + } else { + connectedTexRenderer.setForceAllEdges(false); + } + connectedTexRenderer.setEdgeTexture(EnderIO.blockCapBank.getBorderIcon(0, meta)); + CustomCubeRenderer.instance.renderBlock(world, block, x, y, z, connectedTexRenderer); + return true; + } + + @Override + public boolean shouldRender3DInInventory(int modelId) { + return true; + } + + @Override + public int getRenderId() { + return BlockCapBank.renderId; + } + + //------- Item + @Override + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + return true; + } + + @Override + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + return true; + } + + @Override + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + + RenderUtil.bindBlockTexture(); + Tessellator tes = Tessellator.instance; + + tes.startDrawingQuads(); + CubeRenderer.render(EnderIO.blockCapBank, item.getItemDamage()); + tes.draw(); + + GL11.glEnable(GL11.GL_POLYGON_OFFSET_FILL); + GL11.glPolygonOffset(-1.0f, -1.0f); + + tes.startDrawingQuads(); + tes.setColorRGBA_F(1, 1, 1, 1); + renderBorder(null, 0, 0, 0, item.getItemDamage()); + tes.draw(); + + GL11.glDisable(GL11.GL_POLYGON_OFFSET_FILL); + + } + + private void renderBorder(IBlockAccess blockAccess, int x, int y, int z, int meta) { + IIcon texture = EnderIO.blockCapBank.getBorderIcon(0, meta); + for (ForgeDirection face : ForgeDirection.VALID_DIRECTIONS) { + RenderUtil.renderConnectedTextureFace(blockAccess, x, y, z, face, texture, + blockAccess == null, false, false); + } + } + + //---- Info Display + + @Override + public void renderTileEntityAt(TileEntity te, double x, double y, double z, float partialTick) { + + TileCapBank cb = (TileCapBank) te; + + float f = cb.getWorldObj().getBlockLightValue(te.xCoord, te.yCoord, te.zCoord); + int l = cb.getWorldObj().getLightBrightnessForSkyBlocks(te.xCoord, te.yCoord, te.zCoord, 0); + int l1 = l % 65536; + int l2 = l / 65536; + Tessellator.instance.setColorOpaque_F(f, f, f); + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, l1, l2); + + GL11.glPushAttrib(GL11.GL_ENABLE_BIT); + GL11.glEnable(GL11.GL_POLYGON_OFFSET_FILL); + GL11.glPolygonOffset(-1.0f, -1.0f); + GL11.glDisable(GL11.GL_LIGHTING); + + // GL11.glEnable(GL11.GL_BLEND); + // GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + + GL11.glPushMatrix(); + GL11.glTranslatef((float) x, (float) y, (float) z); + + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + InfoDisplayType type = cb.getDisplayType(dir); + if(type != InfoDisplayType.NONE) { + renderInfoDisplay(cb, dir, type, x, y, z, partialTick); + } + } + + GL11.glPopMatrix(); + GL11.glPopAttrib(); + //GL11.glDisable(GL11.GL_POLYGON_OFFSET_FILL); + + } + + private void renderInfoDisplay(TileCapBank cb, ForgeDirection dir, InfoDisplayType type, double x, double y, double z, float partialTick) { + CapBankClientNetwork nw = (CapBankClientNetwork) cb.getNetwork(); + if(type == InfoDisplayType.LEVEL_BAR && nw != null) { + nw.requestPowerUpdate(cb, 20); + } + + RenderUtil.bindBlockTexture(); + + int brightness = cb.getWorldObj().getLightBrightnessForSkyBlocks(cb.xCoord + dir.offsetX, cb.yCoord + dir.offsetY, cb.zCoord + dir.offsetZ, 0); + + Tessellator tes = Tessellator.instance; + tes.startDrawingQuads(); + tes.setBrightness(brightness); + tes.setColorOpaque_F(1, 1, 1); + + if(type == InfoDisplayType.LEVEL_BAR) { + fillGauge.render(cb, nw, dir); + } + + tes.draw(); + + + } + + protected BoundingBox getBoundForFace(ForgeDirection dir) { + + double widthScale = 0.25; + double heightScale = 0.8; + ; + boolean isUp = dir.offsetY != 0; + + double xScale = dir.offsetX == 0 ? widthScale : 1; + double yScale = isUp ? widthScale : heightScale; + double zScale = isUp ? heightScale : (dir.offsetZ == 0 ? widthScale : 1); + + BoundingBox bb = BoundingBox.UNIT_CUBE; + Vector3d off = ForgeDirectionOffsets.forDirCopy(dir); + off.scale(-1); + bb = bb.translate(off); + bb = bb.scale(xScale, yScale, zScale); + off.scale(-1); + bb = bb.translate(off); + return bb; + } + + // private int getEnergyStoredScaled(CapBankClientNetwork network, int scale) { + // return (int) VecmathUtil.clamp(Math.round(scale * network.getEnergyStoredRatio()), 0, scale); + // } + + +} diff --git a/src/main/java/crazypants/enderio/machine/capbank/render/FillGauge.java b/src/main/java/crazypants/enderio/machine/capbank/render/FillGauge.java new file mode 100644 index 00000000..c27bd69c --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/capbank/render/FillGauge.java @@ -0,0 +1,288 @@ +package crazypants.enderio.machine.capbank.render; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; +import crazypants.enderio.EnderIO; +import crazypants.enderio.machine.capbank.InfoDisplayType; +import crazypants.enderio.machine.capbank.TileCapBank; +import crazypants.enderio.machine.capbank.network.CapBankClientNetwork; +import crazypants.render.BoundingBox; +import crazypants.render.RenderUtil; +import crazypants.util.BlockCoord; +import crazypants.util.ForgeDirectionOffsets; +import crazypants.vecmath.Vector3d; +import crazypants.vecmath.Vector4f; +import crazypants.vecmath.Vertex; + +public class FillGauge { + + private static final double HEIGHT = 0.75; + private static final double VERT_BORDER = (1 - HEIGHT) / 2; + private static final double WIDTH = 0.25; + + enum Type { + SINGLE, + TOP, + BOTTOM, + MIDDLE + } + + private IIcon barIcon; + private IIcon gaugeIcon; + + private float barHeightV; + + private Map> gaugeVertexCache; + private Map> levelVertexCache; + private float barMinV; + + FillGauge() { + } + + public void render(TileCapBank cb, CapBankClientNetwork nw, ForgeDirection dir) { + if(gaugeVertexCache == null) { + createVertexCache(); + } + GaugeInfo info = getGaugeInfo(cb, dir); + GaugeKey key = new GaugeKey(dir, info.type); + List verts = gaugeVertexCache.get(key); + RenderUtil.addVerticesToTessellator(verts, Tessellator.instance); + + renderFillBar(key, nw, info); + + } + + private void renderFillBar(GaugeKey key, CapBankClientNetwork nw, GaugeInfo info) { + double ratio = 0; + if(nw != null) { + ratio = nw.getEnergyStoredRatio(); + } + if(ratio <= 0) { + return; + } + double maxY = ratio * info.height; + if(maxY <= info.yPosition) { + //empty + return; + } + + Vector3d offset = ForgeDirectionOffsets.offsetScaled(key.dir, 0.005); + Tessellator.instance.addTranslation((float) offset.x, (float) offset.y, (float) offset.z); + + List verts = levelVertexCache.get(key); + if(maxY >= info.yPosition + 1) { + //full bar + RenderUtil.addVerticesToTessellator(verts, Tessellator.instance); + + } else { + //need to render partial bar + double myMaxY = maxY - info.yPosition; + + if(info.type == Type.BOTTOM || info.type == Type.SINGLE) { + //If we have some power and we are the bottom bit of the display, + //always show at least a little bit in the bar + myMaxY = Math.max(0.2, myMaxY); + } + List newVerts = new ArrayList(); + for (Vertex v : verts) { + v = new Vertex(v); + newVerts.add(v); + if(v.y() > myMaxY) { + v.setXYZ(v.x(), myMaxY, v.z()); + v.setUV(v.u(), barMinV + (float) (myMaxY * barHeightV)); + } + } + RenderUtil.addVerticesToTessellator(newVerts, Tessellator.instance); + } + offset.scale(-1); + Tessellator.instance.addTranslation((float) offset.x, (float) offset.y, (float) offset.z); + + } + + private GaugeInfo getGaugeInfo(TileCapBank cb, ForgeDirection dir) { + int height = 1; + int yPos = 0; + BlockCoord loc = cb.getLocation(); + boolean found = true; + while (found) { + loc = loc.getLocation(ForgeDirection.UP); + if(isGaugeType(cb.getWorldObj(), loc, dir)) { + height++; + } else { + found = false; + } + } + + loc = cb.getLocation(); + found = true; + while (found) { + loc = loc.getLocation(ForgeDirection.DOWN); + if(isGaugeType(cb.getWorldObj(), loc, dir)) { + height++; + yPos++; + } else { + found = false; + } + } + + return new GaugeInfo(height, yPos); + + } + + // private Type getType(TileCapBank cb, ForgeDirection dir) { + // boolean hasAbove = isGaugeType(cb.getWorldObj(), cb.getLocation().getLocation(ForgeDirection.UP), dir); + // boolean hasBellow = isGaugeType(cb.getWorldObj(), cb.getLocation().getLocation(ForgeDirection.DOWN), dir); + // + // if(!hasAbove && !hasBellow) { + // return Type.SINGLE; + // } else if(hasAbove && !hasBellow) { + // return Type.TOP; + // } else if(!hasAbove && hasBellow) { + // return Type.BOTTOM; + // } + // return Type.MIDDLE; + // } + + private boolean isGaugeType(World worldObj, BlockCoord bc, ForgeDirection face) { + TileEntity te = worldObj.getTileEntity(bc.x, bc.y, bc.z); + if(te instanceof TileCapBank) { + return ((TileCapBank) te).getDisplayType(face) == InfoDisplayType.LEVEL_BAR; + } + return false; + } + + private void createVertexCache() { + barIcon = EnderIO.blockCapBank.getFillBarIcon(); + barMinV = barIcon.getMinV(); + barHeightV = barIcon.getMaxV() - barIcon.getMinV(); + gaugeIcon = EnderIO.blockCapBank.getGaugeIcon(); + + gaugeVertexCache = new HashMap>(); + levelVertexCache = new HashMap>(); + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + if(dir.offsetY == 0) { + for (Type type : Type.values()) { + GaugeKey key = new GaugeKey(dir, type); + gaugeVertexCache.put(key, createGaugeBoundForFace(key, gaugeIcon)); + levelVertexCache.put(key, createGaugeBoundForFace(key, barIcon)); + } + } + } + } + + protected List createGaugeBoundForFace(GaugeKey key, IIcon icon) { + + ForgeDirection dir = key.dir; + Type type = key.type; + + double widthScale = 0.25; + double heightScale = 0.8; + + double xScale = dir.offsetX == 0 ? widthScale : 1; + double yScale = 1; + double zScale = dir.offsetZ == 0 ? widthScale : 1; + + BoundingBox bb = BoundingBox.UNIT_CUBE; + Vector3d off = ForgeDirectionOffsets.forDirCopy(dir); + off.scale(-1); + bb = bb.translate(off); + bb = bb.scale(xScale, yScale, zScale); + off.scale(-1); + bb = bb.translate(off); + + Vector4f uv = getUvForType(key.type, icon); + + List result = bb.getCornersWithUvForFace(dir, uv.x, uv.y, uv.z, uv.w); + return result; + } + + private Vector4f getUvForType(Type type, IIcon icon) { + double uWidth = (icon.getMaxU() - icon.getMinU()) / 4; + + Vector4f res = new Vector4f(); + res.x = (float) (icon.getMinU() + type.ordinal() * uWidth); + res.y = (float) (res.x + uWidth); + + res.z = icon.getMinV(); + res.w = icon.getMaxV(); + return res; + } + + private static class GaugeInfo { + + int height; + int yPosition; + Type type; + + GaugeInfo(int height, int position) { + this.height = height; + yPosition = position; + type = calcType(); + } + + Type calcType() { + if(height == 1) { + return Type.SINGLE; + } + if(yPosition == 0) { + return Type.BOTTOM; + } + if(yPosition == height - 1) { + return Type.TOP; + } + return Type.MIDDLE; + } + + } + + private static class GaugeKey { + + ForgeDirection dir; + Type type; + + public GaugeKey(ForgeDirection dir, Type type) { + this.dir = dir; + this.type = type; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((dir == null) ? 0 : dir.hashCode()); + result = prime * result + ((type == null) ? 0 : type.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if(this == obj) { + return true; + } + if(obj == null) { + return false; + } + if(getClass() != obj.getClass()) { + return false; + } + GaugeKey other = (GaugeKey) obj; + if(dir != other.dir) { + return false; + } + if(type != other.type) { + return false; + } + return true; + } + + } + +} diff --git a/src/main/java/crazypants/render/IconUtil.java b/src/main/java/crazypants/render/IconUtil.java index bf991395..3a9c7e22 100644 --- a/src/main/java/crazypants/render/IconUtil.java +++ b/src/main/java/crazypants/render/IconUtil.java @@ -34,6 +34,7 @@ public class IconUtil { public void registerIcons(IIconRegister register) { whiteTexture = register.registerIcon("enderio:white"); errorTexture = register.registerIcon("enderio:error"); + blankTexture = register.registerIcon("enderio:blank"); } @Override From 3cd0b7f7367877f938522b180865052600223315 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Fri, 5 Dec 2014 23:35:36 +0800 Subject: [PATCH 09/12] Added I/O display for cap banks. --- .../textures/blocks/capBankInfoPanel.png | Bin 0 -> 175 bytes .../enderio/machine/capbank/BlockCapBank.java | 39 ++++++ .../machine/capbank/InfoDisplayType.java | 3 +- .../enderio/machine/capbank/TileCapBank.java | 2 +- .../capbank/render/CapBankRenderer.java | 82 ++--------- .../machine/capbank/render/FillGauge.java | 24 +++- .../machine/capbank/render/IInfoRenderer.java | 10 ++ .../machine/capbank/render/IoDisplay.java | 128 ++++++++++++++++++ .../farm/FarmingStationSpecialRenderer.java | 19 +-- .../machine/power/PowerDisplayUtil.java | 4 +- 10 files changed, 222 insertions(+), 89 deletions(-) create mode 100644 resources/assets/enderio/textures/blocks/capBankInfoPanel.png create mode 100644 src/main/java/crazypants/enderio/machine/capbank/render/IInfoRenderer.java create mode 100644 src/main/java/crazypants/enderio/machine/capbank/render/IoDisplay.java diff --git a/resources/assets/enderio/textures/blocks/capBankInfoPanel.png b/resources/assets/enderio/textures/blocks/capBankInfoPanel.png new file mode 100644 index 0000000000000000000000000000000000000000..31918aa33f1b9766b75738219ccec449cc103704 GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0figD*u3fvV&@T^vI!{F4>f&%_(f_b^%2C;`GQ>)3=Cn3)+~s+VZUcZS^ns$}qV L^>bP0l+XkK$44yV literal 0 HcmV?d00001 diff --git a/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java index 1f17649b..abb9d0f3 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java @@ -1,6 +1,7 @@ package crazypants.enderio.machine.capbank; import java.util.ArrayList; +import java.util.Collection; import java.util.List; import java.util.Random; @@ -34,6 +35,7 @@ import crazypants.enderio.gui.TooltipAddera; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.capbank.network.CapBankClientNetwork; import crazypants.enderio.machine.capbank.network.ICapBankNetwork; +import crazypants.enderio.machine.capbank.network.NetworkUtil; import crazypants.enderio.machine.capbank.packet.PacketGuiChange; import crazypants.enderio.machine.capbank.packet.PacketNetworkEnergyRequest; import crazypants.enderio.machine.capbank.packet.PacketNetworkEnergyResponse; @@ -84,6 +86,8 @@ public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTool private IIcon[] outputIcons; @SideOnly(Side.CLIENT) private IIcon[] lockedIcons; + @SideOnly(Side.CLIENT) + private IIcon infoPanelIcon; protected BlockCapBank() { super(ModObject.blockCapBank.unlocalisedName, TileCapBank.class); @@ -226,6 +230,7 @@ public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTool blockIcon = IIconRegister.registerIcon("enderio:capacitorBank"); gaugeIcon = IIconRegister.registerIcon("enderio:capacitorBankOverlays"); fillBarIcon = IIconRegister.registerIcon("enderio:capacitorBankFillBar"); + infoPanelIcon = IIconRegister.registerIcon("enderio:capBankInfoPanel"); blockIcons = new IIcon[CapBankType.types().size()]; borderIcons = new IIcon[CapBankType.types().size()]; @@ -290,6 +295,11 @@ public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTool if(!(te instanceof TileCapBank)) { return blockIcons[0]; } + + // if(true) { + // return IconUtil.blankTexture; + // } + TileCapBank cb = (TileCapBank) te; ForgeDirection face = ForgeDirection.values()[side]; @@ -309,14 +319,21 @@ public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTool return lockedIcons[meta]; } + @SideOnly(Side.CLIENT) public IIcon getGaugeIcon() { return gaugeIcon; } + @SideOnly(Side.CLIENT) public IIcon getFillBarIcon() { return fillBarIcon; } + @SideOnly(Side.CLIENT) + public IIcon getInfoPanelIcon() { + return infoPanelIcon; + } + @Override public void onNeighborBlockChange(World world, int x, int y, int z, Block blockId) { if(world.isRemote) { @@ -347,12 +364,34 @@ public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTool if(stack.stackTagCompound != null) { cb.readCommonNBT(stack.stackTagCompound); } + + Collection neigbours = NetworkUtil.getNeigbours(cb); + if(neigbours.isEmpty()) { + int heading = MathHelper.floor_double(player.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; + ForgeDirection dir = getDirForHeading(heading); + cb.setDisplayType(dir, InfoDisplayType.LEVEL_BAR); + } + if(world.isRemote) { return; } world.markBlockForUpdate(x, y, z); } + protected ForgeDirection getDirForHeading(int heading) { + switch (heading) { + case 0: + return ForgeDirection.values()[2]; + case 1: + return ForgeDirection.values()[5]; + case 2: + return ForgeDirection.values()[3]; + case 3: + default: + return ForgeDirection.values()[4]; + } + } + @Override public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { ArrayList ret = new ArrayList(); diff --git a/src/main/java/crazypants/enderio/machine/capbank/InfoDisplayType.java b/src/main/java/crazypants/enderio/machine/capbank/InfoDisplayType.java index b8f464ec..fcd0ac97 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/InfoDisplayType.java +++ b/src/main/java/crazypants/enderio/machine/capbank/InfoDisplayType.java @@ -4,7 +4,8 @@ package crazypants.enderio.machine.capbank; public enum InfoDisplayType { NONE, - LEVEL_BAR; + LEVEL_BAR, + IO; public InfoDisplayType next() { int ord = ordinal(); diff --git a/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java index d67d81ad..146f5993 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java @@ -344,7 +344,7 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor for (Entry entry : faceDisplayTypes.entrySet()) { BlockCoord bc = getLocation().getLocation(entry.getKey()); Block block = worldObj.getBlock(bc.x, bc.y, bc.z); - if(block != null && block.isOpaqueCube()) { + if(block != null && (block.isOpaqueCube() || block == EnderIO.blockCapBank)) { reset.add(entry.getKey()); } } diff --git a/src/main/java/crazypants/enderio/machine/capbank/render/CapBankRenderer.java b/src/main/java/crazypants/enderio/machine/capbank/render/CapBankRenderer.java index 5f46f163..a37734bc 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/render/CapBankRenderer.java +++ b/src/main/java/crazypants/enderio/machine/capbank/render/CapBankRenderer.java @@ -1,7 +1,9 @@ package crazypants.enderio.machine.capbank.render; +import java.util.HashMap; +import java.util.Map; + import net.minecraft.block.Block; -import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -21,24 +23,24 @@ import crazypants.enderio.machine.capbank.BlockCapBank; import crazypants.enderio.machine.capbank.CapBankType; import crazypants.enderio.machine.capbank.InfoDisplayType; import crazypants.enderio.machine.capbank.TileCapBank; -import crazypants.enderio.machine.capbank.network.CapBankClientNetwork; -import crazypants.render.BoundingBox; import crazypants.render.ConnectedTextureRenderer; import crazypants.render.CubeRenderer; import crazypants.render.CustomCubeRenderer; import crazypants.render.RenderUtil; -import crazypants.util.ForgeDirectionOffsets; -import crazypants.vecmath.Vector3d; public class CapBankRenderer extends TileEntitySpecialRenderer implements ISimpleBlockRenderingHandler, IItemRenderer { private ConnectedTextureRenderer connectedTexRenderer; - private FillGauge fillGauge; + + private Map infoRenderers; public CapBankRenderer() { connectedTexRenderer = new ConnectedTextureRenderer(); connectedTexRenderer.setMatchMeta(true); - fillGauge = new FillGauge(); + infoRenderers = new HashMap(); + infoRenderers.put(InfoDisplayType.LEVEL_BAR, new FillGauge()); + infoRenderers.put(InfoDisplayType.IO, new IoDisplay()); + } //------- Block @@ -121,20 +123,10 @@ public class CapBankRenderer extends TileEntitySpecialRenderer implements ISimpl TileCapBank cb = (TileCapBank) te; - float f = cb.getWorldObj().getBlockLightValue(te.xCoord, te.yCoord, te.zCoord); - int l = cb.getWorldObj().getLightBrightnessForSkyBlocks(te.xCoord, te.yCoord, te.zCoord, 0); - int l1 = l % 65536; - int l2 = l / 65536; - Tessellator.instance.setColorOpaque_F(f, f, f); - OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, l1, l2); GL11.glPushAttrib(GL11.GL_ENABLE_BIT); GL11.glEnable(GL11.GL_POLYGON_OFFSET_FILL); GL11.glPolygonOffset(-1.0f, -1.0f); - GL11.glDisable(GL11.GL_LIGHTING); - - // GL11.glEnable(GL11.GL_BLEND); - // GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GL11.glPushMatrix(); GL11.glTranslatef((float) x, (float) y, (float) z); @@ -142,64 +134,16 @@ public class CapBankRenderer extends TileEntitySpecialRenderer implements ISimpl for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { InfoDisplayType type = cb.getDisplayType(dir); if(type != InfoDisplayType.NONE) { - renderInfoDisplay(cb, dir, type, x, y, z, partialTick); + IInfoRenderer rend = infoRenderers.get(type); + if(rend != null) { + rend.render(cb, dir, x, y, z, partialTick); + } } } GL11.glPopMatrix(); GL11.glPopAttrib(); - //GL11.glDisable(GL11.GL_POLYGON_OFFSET_FILL); } - private void renderInfoDisplay(TileCapBank cb, ForgeDirection dir, InfoDisplayType type, double x, double y, double z, float partialTick) { - CapBankClientNetwork nw = (CapBankClientNetwork) cb.getNetwork(); - if(type == InfoDisplayType.LEVEL_BAR && nw != null) { - nw.requestPowerUpdate(cb, 20); - } - - RenderUtil.bindBlockTexture(); - - int brightness = cb.getWorldObj().getLightBrightnessForSkyBlocks(cb.xCoord + dir.offsetX, cb.yCoord + dir.offsetY, cb.zCoord + dir.offsetZ, 0); - - Tessellator tes = Tessellator.instance; - tes.startDrawingQuads(); - tes.setBrightness(brightness); - tes.setColorOpaque_F(1, 1, 1); - - if(type == InfoDisplayType.LEVEL_BAR) { - fillGauge.render(cb, nw, dir); - } - - tes.draw(); - - - } - - protected BoundingBox getBoundForFace(ForgeDirection dir) { - - double widthScale = 0.25; - double heightScale = 0.8; - ; - boolean isUp = dir.offsetY != 0; - - double xScale = dir.offsetX == 0 ? widthScale : 1; - double yScale = isUp ? widthScale : heightScale; - double zScale = isUp ? heightScale : (dir.offsetZ == 0 ? widthScale : 1); - - BoundingBox bb = BoundingBox.UNIT_CUBE; - Vector3d off = ForgeDirectionOffsets.forDirCopy(dir); - off.scale(-1); - bb = bb.translate(off); - bb = bb.scale(xScale, yScale, zScale); - off.scale(-1); - bb = bb.translate(off); - return bb; - } - - // private int getEnergyStoredScaled(CapBankClientNetwork network, int scale) { - // return (int) VecmathUtil.clamp(Math.round(scale * network.getEnergyStoredRatio()), 0, scale); - // } - - } diff --git a/src/main/java/crazypants/enderio/machine/capbank/render/FillGauge.java b/src/main/java/crazypants/enderio/machine/capbank/render/FillGauge.java index c27bd69c..b19bffa5 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/render/FillGauge.java +++ b/src/main/java/crazypants/enderio/machine/capbank/render/FillGauge.java @@ -22,7 +22,7 @@ import crazypants.vecmath.Vector3d; import crazypants.vecmath.Vector4f; import crazypants.vecmath.Vertex; -public class FillGauge { +public class FillGauge implements IInfoRenderer { private static final double HEIGHT = 0.75; private static final double VERT_BORDER = (1 - HEIGHT) / 2; @@ -47,17 +47,35 @@ public class FillGauge { FillGauge() { } - public void render(TileCapBank cb, CapBankClientNetwork nw, ForgeDirection dir) { + @Override + public void render(TileCapBank cb, ForgeDirection dir, double x, double y, double z, float partialTick) { if(gaugeVertexCache == null) { createVertexCache(); } + CapBankClientNetwork nw = null; + if(cb.getNetwork() != null) { + nw = (CapBankClientNetwork) cb.getNetwork(); + nw.requestPowerUpdate(cb, 20); + } + + + RenderUtil.bindBlockTexture(); + + int brightness = cb.getWorldObj().getLightBrightnessForSkyBlocks(cb.xCoord + dir.offsetX, cb.yCoord + dir.offsetY, cb.zCoord + dir.offsetZ, 0); + + Tessellator tes = Tessellator.instance; + tes.startDrawingQuads(); + tes.setBrightness(brightness); + tes.setColorOpaque_F(1, 1, 1); + GaugeInfo info = getGaugeInfo(cb, dir); GaugeKey key = new GaugeKey(dir, info.type); List verts = gaugeVertexCache.get(key); RenderUtil.addVerticesToTessellator(verts, Tessellator.instance); - renderFillBar(key, nw, info); + tes.draw(); + } private void renderFillBar(GaugeKey key, CapBankClientNetwork nw, GaugeInfo info) { diff --git a/src/main/java/crazypants/enderio/machine/capbank/render/IInfoRenderer.java b/src/main/java/crazypants/enderio/machine/capbank/render/IInfoRenderer.java new file mode 100644 index 00000000..1c2b977c --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/capbank/render/IInfoRenderer.java @@ -0,0 +1,10 @@ +package crazypants.enderio.machine.capbank.render; + +import net.minecraftforge.common.util.ForgeDirection; +import crazypants.enderio.machine.capbank.TileCapBank; + +public interface IInfoRenderer { + + void render(TileCapBank cb, ForgeDirection dir, double x, double y, double z, float partialTick); + +} diff --git a/src/main/java/crazypants/enderio/machine/capbank/render/IoDisplay.java b/src/main/java/crazypants/enderio/machine/capbank/render/IoDisplay.java new file mode 100644 index 00000000..cf1b8e31 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/capbank/render/IoDisplay.java @@ -0,0 +1,128 @@ +package crazypants.enderio.machine.capbank.render; + +import java.util.List; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.util.IIcon; +import net.minecraftforge.common.util.ForgeDirection; + +import org.lwjgl.opengl.GL11; + +import crazypants.enderio.EnderIO; +import crazypants.enderio.machine.capbank.TileCapBank; +import crazypants.enderio.machine.capbank.network.CapBankClientNetwork; +import crazypants.enderio.machine.power.PowerDisplayUtil; +import crazypants.render.BoundingBox; +import crazypants.render.ColorUtil; +import crazypants.render.RenderUtil; +import crazypants.vecmath.Vector3f; +import crazypants.vecmath.Vertex; + +public class IoDisplay implements IInfoRenderer { + + @Override + public void render(TileCapBank cb, ForgeDirection dir, double x, double y, double z, float partialTick) { + + boolean selfIlum = true; + int brightness = 0; + if(!selfIlum) { + brightness = cb.getWorldObj().getLightBrightnessForSkyBlocks(cb.xCoord + dir.offsetX, cb.yCoord + dir.offsetY, cb.zCoord + dir.offsetZ, 0); + int l1 = brightness % 65536; + int l2 = brightness / 65536; + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, l1, l2); + } else { + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240, 240); + } + + boolean drawBackground = true; + if(drawBackground) { + RenderUtil.bindBlockTexture(); + + Tessellator tes = Tessellator.instance; + tes.startDrawingQuads(); + if(!selfIlum) { + tes.setBrightness(brightness); + } + tes.setColorOpaque_F(1, 1, 1); + + double scale = 0.85; + BoundingBox bb = BoundingBox.UNIT_CUBE; + double xScale = dir.offsetX == 0 ? scale : 1; + double yScale = scale; + double zScale = dir.offsetZ == 0 ? scale : 1; + bb = bb.scale(xScale, yScale, zScale); + + IIcon icon = EnderIO.blockCapBank.getInfoPanelIcon(); + List verts = bb.getCornersWithUvForFace(dir, icon.getMinU(), icon.getMaxU(), icon.getMinV(), icon.getMaxV()); + RenderUtil.addVerticesToTesselator(verts); + + tes.draw(); + } + + CapBankClientNetwork nw = null; + if(cb.getNetwork() != null) { + nw = (CapBankClientNetwork) cb.getNetwork(); + nw.requestPowerUpdate(cb, 20); + } else { + return; + } + + int change = Math.round(nw.getAverageChangePerTick()); + //change = 0; + Vector3f col = new Vector3f(0, 0, 0); + if(change > 0) { + col = new Vector3f(0, 0.025, 0); + } else if(change < 0) { + col = new Vector3f(0.05, 0, 0); + } + + FontRenderer fr = Minecraft.getMinecraft().fontRenderer; + String changeText = getChangeText(change, fr); + + String HeadingText = change > 0 ? "In" : change < 0 ? "Out" : "I/O"; + float size = 0.15f; + float scale = size / fr.FONT_HEIGHT; + + GL11.glPushMatrix(); + GL11.glTranslatef(0.5f, 0.5f + (size / 2), 0.5f); + GL11.glTranslatef((float) (dir.offsetX * 1.01) / 2, 0, (float) (dir.offsetZ * 1.01) / 2); + GL11.glRotatef(-180, 1, 0, 0); + if(dir == ForgeDirection.NORTH) { + GL11.glRotatef(-180, 0, 1, 0); + } else if(dir == ForgeDirection.EAST) { + GL11.glRotatef(-90, 0, 1, 0); + } else if(dir == ForgeDirection.WEST) { + GL11.glRotatef(90, 0, 1, 0); + } + + GL11.glPushMatrix(); + GL11.glTranslatef(0, -size, 0); + GL11.glScalef(scale, scale, scale); + fr.drawString(HeadingText, -fr.getStringWidth(HeadingText) / 2, 0, ColorUtil.getRGB(col)); + GL11.glPopMatrix(); + + GL11.glPushMatrix(); + GL11.glTranslatef(0, size / 2, 0); + GL11.glScalef(scale, scale, scale); + fr.drawString(changeText, -fr.getStringWidth(changeText) / 2, 0, ColorUtil.getRGB(col)); + GL11.glPopMatrix(); + + GL11.glPopMatrix(); + + } + + protected String getChangeText(int change, FontRenderer fr) { + change = Math.abs(change); + String txt = PowerDisplayUtil.INT_NF.format(change); + int width = fr.getStringWidth(txt); + if(width > 38 && change > 1000) { + change = change / 1000; + txt = PowerDisplayUtil.INT_NF.format(change) + "K"; + } + return txt; + } + +} diff --git a/src/main/java/crazypants/enderio/machine/farm/FarmingStationSpecialRenderer.java b/src/main/java/crazypants/enderio/machine/farm/FarmingStationSpecialRenderer.java index d47f8bf6..34c6938b 100644 --- a/src/main/java/crazypants/enderio/machine/farm/FarmingStationSpecialRenderer.java +++ b/src/main/java/crazypants/enderio/machine/farm/FarmingStationSpecialRenderer.java @@ -1,26 +1,19 @@ package crazypants.enderio.machine.farm; +import static org.lwjgl.opengl.GL11.GL_LIGHTING; +import static org.lwjgl.opengl.GL11.glDisable; +import static org.lwjgl.opengl.GL11.glEnable; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.tileentity.TileEntity; import crazypants.enderio.config.Config; import crazypants.render.RenderUtil; import crazypants.vecmath.Vector3f; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; -import static org.lwjgl.opengl.GL11.*; public class FarmingStationSpecialRenderer extends TileEntitySpecialRenderer{ private void renderFarmStationAt(TileFarmStation tile, double x, double y, double z, float partialTickTime) { - Minecraft mc = Minecraft.getMinecraft(); - FontRenderer fnt = mc.fontRenderer; - Tessellator tessellator = Tessellator.instance; - String toRender = tile.notification; + String toRender = tile.notification; if ("".equals(toRender) || Config.disableFarmNotification) { return; } diff --git a/src/main/java/crazypants/enderio/machine/power/PowerDisplayUtil.java b/src/main/java/crazypants/enderio/machine/power/PowerDisplayUtil.java index 27e0c781..6b83a5ab 100644 --- a/src/main/java/crazypants/enderio/machine/power/PowerDisplayUtil.java +++ b/src/main/java/crazypants/enderio/machine/power/PowerDisplayUtil.java @@ -10,8 +10,8 @@ import crazypants.util.Lang; public class PowerDisplayUtil { - private static final NumberFormat INT_NF = NumberFormat.getIntegerInstance(); - private static final NumberFormat FLOAT_NF = NumberFormat.getInstance(); + public static final NumberFormat INT_NF = NumberFormat.getIntegerInstance(); + public static final NumberFormat FLOAT_NF = NumberFormat.getInstance(); //Handle french local 'non breaking space' character used to separate thousands. //This is not rendered correctly and cannot be parsed by minecraft so replace it with a regular space From ae1de3b182caf71d4633e0ffe640245f87138b20 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Sat, 6 Dec 2014 00:26:06 +0800 Subject: [PATCH 10/12] Added some localization, configs, textures and a tier 1 cap bank --- resources/assets/enderio/lang/en_US.lang | 3 +- .../blocks/capacitorBankActivatedBorder.png | Bin 0 -> 1338 bytes .../blocks/capacitorBankSimpleBorder.png | Bin 0 -> 918 bytes .../blocks/capacitorBankVibrantBorder.png | Bin 1393 -> 1419 bytes .../crazypants/enderio/config/Config.java | 32 ++++++++++++++++++ .../enderio/machine/capbank/CapBankType.java | 28 ++++++++++----- .../machine/capbank/render/FillGauge.java | 24 ++++--------- 7 files changed, 60 insertions(+), 27 deletions(-) create mode 100644 resources/assets/enderio/textures/blocks/capacitorBankActivatedBorder.png create mode 100644 resources/assets/enderio/textures/blocks/capacitorBankSimpleBorder.png diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index b410aeb0..14f3b591 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -260,7 +260,8 @@ tile.blockCapacitorBank.tooltip.detailed.line2=Can charge RF powered items. tile.blockCapacitorBank.tooltipPrefix=Contains tile.blockCapBank.creative.name=Creative Capacitor Bank -tile.blockCapBank.basic.name=Capacitor Bank +tile.blockCapBank.simple.name=Simple Capacitor Bank +tile.blockCapBank.activated.name=Capacitor Bank tile.blockCapBank.vibrant.name=Vibrant Capacitor Bank tile.blockCapBank.tooltip.detailed.line1=Multi-block energy storage. tile.blockCapBank.tooltip.detailed.line2=Can charge RF powered items. diff --git a/resources/assets/enderio/textures/blocks/capacitorBankActivatedBorder.png b/resources/assets/enderio/textures/blocks/capacitorBankActivatedBorder.png new file mode 100644 index 0000000000000000000000000000000000000000..a6b17c20cdf3591d1ab2b21df48593060586201d GIT binary patch literal 1338 zcmV-A1;zS_P)N2bPDNB8 zb~7$DE-^4L^m3s900g#4L_t(YOMRB-lH)iGg#B_mJHa!yl9jXNyzl?_J^-X7`);qQ z%YhQRfhGWH^J};J9R%-T_z^{4N&J;0+rt9>g3mYxA92JzhW98GgeyeC;I4)toNxO* z2LB{%bmVT${Ha%<)Ao=pzGc+K(df@M8EHaR9_~L(1 zmT}XheU}YGK00Jz=vhpng0u0F*0KC5vHIMRK)bg~%+G4PV60=CtpN z<5-@i%A=f)tccPuaP^={2}&xqf~>H9=vo6S$PhQ=8_dOoL)XDopHI!@(p)d{c{%fU zkvWbel#Edfc=ZG)wdZ_vSRVuY)`Ub@>AwAU*#_2pchPvlgH#?ds? zH?dCO%p4{4=~zyd_rwYsyDWoT1cI_)iFk$me(P>G5x87j1}Xr%!8DY2fEQt?xve^# z#DKHp%?d$q3|j;^bk2nP@C54K3A}{w*dcZ7LM>4*)R%L6xv-JXnqA{a5kkHQ!00nj zf6nJ8b~DEd%WWJE&%l_?{j8h;fKi&VqO2>8nhH>cB~ZGUXoAz+UL zW~x4Ia?wzkxULcorft%$C8C@%8;5dr22O)dg{-hXP31U7RYeKOxPII3-ot=n;Hh95 zDj*rewF^J9@P~n;L!fd39!kmz-3v9y`#vg5CLPbp&D%}{v>W6YoPheH;d^t0eUSb1 zun35T;t20dUGPBc`?PJtqTm4JiN8B$?B;&jb!v{VTlgYi8uo(~PhD_l*MURR z1e6eu%phSu~FdoFVX8 z;9uq_FEy^z!mExuUZn;J0<1U9jy9e%z#`h3>1r0q@vknDvC9bZaqu7kg!1+=5fC(z>yuv04 z;mf^L?hb9vNbkHCV wE&%R8Y=-Vx!M~&9zzp^-fLddR{nu{y51AfICxGfEegFUf07*qoM6N<$f;R4XHvj+t literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/capacitorBankSimpleBorder.png b/resources/assets/enderio/textures/blocks/capacitorBankSimpleBorder.png new file mode 100644 index 0000000000000000000000000000000000000000..986f95001322ac730bc21bef41b3998d605f6b7a GIT binary patch literal 918 zcmV;H18Mw;P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv00098Nkl<>lqo)zznCh(kgle@*Xey)@6x z&WLY(Xj8eqzP`D+xxKypvcoe3@wp)fab1&Mc#aM6P1Nu1?j9Z)`qk^Vh2E-2xvVyA5sNRKl zh?IIs*KiTN3bPnYB|_9S%b=_7SPYv%sT)Q5S0e?O4Gbff?2pwE^_qUE|8967qE}%S z18uA)rldhGFHBe)jMG19;C*sBjL*oXJWGekV5|@6KaDczC34uD2nRAArMsM; zfdohOX#+BS#6V6ra9#MY93F()QJ*P~4-8VGT77NE6HpsIsL;7V`UpNdc z0_AZ^y$s@!hae7VCTG&ib)BzFR@(81!8m>D)AZ3LccRcG0g@@0^zwyM2HA$uU_E`5 zL9wjp@bnl(gy!C$_IaBAT0N95(iLg>Fpv~Y$_FbrTAa0dk$9w|o)sIe+Ixd+GS5j} zY8iCNfk=<)FbW3-^%j}F4vf+`r5=Mx+RR{<2L_&U4zjVO9+fURkoa01Ckf7!1FWkCHRU&B4Q~&?~07*qoM6N<$g39xofB*mh literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/capacitorBankVibrantBorder.png b/resources/assets/enderio/textures/blocks/capacitorBankVibrantBorder.png index a57241ab56ba9c01699844d06e96c9ecd1925570..e83ca6b321202c149028a581884c179649cdb424 100644 GIT binary patch delta 1340 zcmV-C1;hIB3X2PnJPN!301mtXmArCEkwz$g1qVq)K~zXfeU|B#;#LfVd9q1&y4k@7 zylxG%T|BrlHXW zkb7FZ0G@KtmF8bA;d~GOfV{`gC=r%WlMLqG>V*}^&YUHoStk25+v=~f__etJ= zM|hIInYM#2_6=N4vUg-4@A1R6Ur$!Md2(9Dr)72t49R(so>we}hk3A{g?n$goh`SM z)poYnjCsU?OI@4>yE#Wzh|E&y@k8u9932<=HOy~8`4Jn6Tf_=VsPb=g^iYZpzKJ;y z87r*E$Ay6vWQZH`9_C^~c<|w>K9ll)GpW8}j_a>fE?b%OvLvDSNDfW3PDhYX+G>xbZWwXeRu-( z_GiJ7RJ!4tML^>fcFrwoM=g(kjd8wB^}}QUE7F2F{{Kkr@}(NIES%+v_@id_2I3UW%R* zAbbLJ0!@X9-IDmLCJEY<(l!E2X}=yJU_)lLlbL06#toT&2)GKBPQ8nG|jL^PPj{|HD1AG!%XMaIA)?8zx$R7|pgybmY?xsVYX0w5!(XQuIA z0%FlkHEt@S;F1bg*EBkREa&A|h8+UUD?#5dKxEb;6Kv+;){Az2yhk8NkE`qy8_hdbE&?>p}D~(w8M~1=G+x=9+=ugny9m(=+deNCYk_aE%)%DJ$$= zs6l!NR_i&Fj(26RAHE_$E>;E;knr(`@DFa>hY~)|Uto#WV@fCZi%lP){dn1jZX zfPJ>`(Xpr|(l)|>zHFQ!_Gfkzkjqn4o?>&{Y=IX<+W-XhvYUZ?D$znBu#=C5M^&Nb zJEIeLBlDZ-#{TaDLuQdyn5HCfbw;b&vNt``Vdt+-?AY?4#vIO{EOMg)X9&C_@NAAs z0{&9!l{s#_v<;*RpLJHeeEi5jEn3<|Xf0)+&f$K65;PW!OQL;xK$$V2|n yU5%In&vY**#aX=#2ON0T0czNUGkkpue*6vm^&5O3K3-Jn&JPN%401mwYNBfYikwz$g1no&gK~zXfeU=Gt;z$sM`G=X1lRzMl zkaPAwj511;2m}ZaMm7k8xRqmn;(k@tZ5wuHr6-QI`@O2yRb}UXH4c8a4qw{&*Ur&< z@A$oU(&(q)FL>)7gV*j6_ZVI}c|kjajxe~Z?L3^%%^#5G_&dzvdrVe0 ztccRQ#?_%J1t_Ul2C~BXa9T02f(&tgL!QH2Oc+kD;F@l3XWRSP$Gv=R@A#X_EU!r@ zB%!$|B_Kb|y9zXK2}qKT%UB9|4jt?!M!4o5_lwU5F#mW!X1cwLH@D<87L6OzP~XHl zfiv@3QeWLnR+e|26*StxIpiYHjV@RsUSa=wTzo!?!1mr{paQTPOhb8V@FEO+z|ckGZlcA=K2Q|j&Ae0$GEKBw$jTvLRQrvfng z4Ah^^-445%;{_7-EHxXKFpxcwEpNKvg$QIV!WlgPAO5PoW4&ijOec0cfgRH2=i}-N zJn>`Bb`@xvfE_aN5{s5lYEH_3E(hxc)cQ1h&%XYCT7UmU1Ic(*#~2aNGA(fE1SN)M zOLL*@Rxp{e$@=5MCw67ueE(d3JuUVGm;^ywVLv;a>7LpOADDpplNC^ZuwKL8{QVQ8 z0%nnR@)2`y7Ez?AMp7cy0BqRCJzxjEy9%)UT+!Y1%wC1f(_kwIrzkWOZBGg@20 z8GVsVM1yJkpMYdwNr;SrMcAWRRYnD~NS+6sBXS`l8UmvgV z`gRysS~lzuutx$jRi8G01<_EM!MGG~FmXAYR)}asnJsFQ%o#WhJ{7XU`l>!zT=z#M zN=U}_bMxS(eaJEJR4@${kPHT67k*^n&ubhV0W6YoPheH;d^t0y(atVVG$4w#SOd(^_U0ZtQy9ZUUYiGaZP zvJ;%YIRQC?e1ldPo@?>^SLJy2jDQ9Xb(WoeL?Ev03CL>;FCE>mK-s`9zB_03*-b$H zO6rcD)3wTfD%GL4i?`tH6vA@3EatKoyoBOL7?@+PMD%3aP@tM z-PKHnT`u|9u_a55IsD$SC>a$vL*R+PzsylyYFw#>R~>h}N(}-8Sf7;Jv~iLF7SYyB zSF=ctm;JD)Q3ig?3Y(P|Mz{nNg+p;bdqzb%fbd(ivA&^yx>3O_;iL zJ-p=d!s~F{=pNIz1`Nj%*eM^HOa#zDgFLtZxC5~Sx+eqwj*bHf*qZ`sjUD!1je~yx Yte#ZV-}S-`UjP6A07*qoM6N<$g3U5@H~;_u diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java index 0934ec08..279d4be2 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -265,6 +265,15 @@ public final class Config { public static int capacitorBankMaxIoRF = 5000; public static int capacitorBankMaxStorageRF = 5000000; + public static int capacitorBankTierOneMaxIoRF = 1000; + public static int capacitorBankTierOneMaxStorageRF = 1000000; + + public static int capacitorBankTierTwoMaxIoRF = 5000; + public static int capacitorBankTierTwoMaxStorageRF = 5000000; + + public static int capacitorBankTierThreeMaxIoRF = 25000; + public static int capacitorBankTierThreeMaxStorageRF = 25000000; + public static int poweredSpawnerMinDelayTicks = 200; public static int poweredSpawnerMaxDelayTicks = 800; public static int poweredSpawnerLevelOnePowerPerTickRF = 160; @@ -384,6 +393,8 @@ public final class Config { public static int enchantmentSoulBoundWeight = 1; public static boolean enchantmentSoulBoundEnabled = true; + + public static void load(FMLPreInitializationEvent event) { FMLCommonHandler.instance().bus().register(new Config()); @@ -439,6 +450,27 @@ public final class Config { "The maximum storage for a single capacitor in RF") .getInt(capacitorBankMaxStorageRF); + capacitorBankTierOneMaxIoRF = config.get(sectionPower.name, "capacitorBankTierOneMaxIoRF", capacitorBankTierOneMaxIoRF, + "The maximum IO for a single tier one capacitor in RF/t") + .getInt(capacitorBankTierOneMaxIoRF); + capacitorBankTierOneMaxStorageRF = config.get(sectionPower.name, "capacitorBankTierOneMaxStorageRF", capacitorBankTierOneMaxStorageRF, + "The maximum storage for a single tier one capacitor in RF") + .getInt(capacitorBankTierOneMaxStorageRF); + + capacitorBankTierTwoMaxIoRF = config.get(sectionPower.name, "capacitorBankTierTwoMaxIoRF", capacitorBankTierTwoMaxIoRF, + "The maximum IO for a single tier two capacitor in RF/t") + .getInt(capacitorBankTierTwoMaxIoRF); + capacitorBankTierTwoMaxStorageRF = config.get(sectionPower.name, "capacitorBankTierTwoMaxStorageRF", capacitorBankTierTwoMaxStorageRF, + "The maximum storage for a single tier two capacitor in RF") + .getInt(capacitorBankTierTwoMaxStorageRF); + + capacitorBankTierThreeMaxIoRF = config.get(sectionPower.name, "capacitorBankTierThreeMaxIoRF", capacitorBankTierThreeMaxIoRF, + "The maximum IO for a single tier three capacitor in RF/t") + .getInt(capacitorBankTierThreeMaxIoRF); + capacitorBankTierThreeMaxStorageRF = config.get(sectionPower.name, "capacitorBankTierThreeMaxStorageRF", capacitorBankTierThreeMaxStorageRF, + "The maximum storage for a single tier three capacitor in RF") + .getInt(capacitorBankTierThreeMaxStorageRF); + powerConduitTierOneRF = config.get(sectionPower.name, "powerConduitTierOneRF", powerConduitTierOneRF, "The maximum IO for the tier 1 power conduit") .getInt(powerConduitTierOneRF); powerConduitTierTwoRF = config.get(sectionPower.name, "powerConduitTierTwoRF", powerConduitTierTwoRF, "The maximum IO for the tier 2 power conduit") diff --git a/src/main/java/crazypants/enderio/machine/capbank/CapBankType.java b/src/main/java/crazypants/enderio/machine/capbank/CapBankType.java index eae9f00a..8cf3aa6b 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/CapBankType.java +++ b/src/main/java/crazypants/enderio/machine/capbank/CapBankType.java @@ -9,14 +9,25 @@ import crazypants.enderio.config.Config; public class CapBankType { - private static final CapBankType CREATIVE = new CapBankType("CREATIVE", "tile.blockCapBank.creative", 500000, Config.capacitorBankMaxStorageRF, false, true, + private static final CapBankType CREATIVE = new CapBankType("CREATIVE", "tile.blockCapBank.creative", 500000, Config.capacitorBankTierTwoMaxStorageRF, false, + true, "enderio:capacitorBank", "enderio:capacitorBankCreativeBorder", "enderio:capacitorBankInput", "enderio:capacitorBankOutput", "enderio:capacitorBankLocked"); - private static final CapBankType BASIC = new CapBankType("BASIC", "tile.blockCapBank.basic", Config.capacitorBankMaxIoRF, Config.capacitorBankMaxStorageRF, + + private static final CapBankType SIMPLE = new CapBankType("SIMPLE", "tile.blockCapBank.simple", Config.capacitorBankTierOneMaxIoRF, + Config.capacitorBankTierOneMaxStorageRF, true, - false, "enderio:capacitorBank", "enderio:blankMachinePanel", "enderio:capacitorBankInput", "enderio:capacitorBankOutput", "enderio:capacitorBankLocked"); - private static final CapBankType VIBRANT = new CapBankType("VIBRANT", "tile.blockCapBank.vibrant", Config.capacitorBankMaxIoRF * 4, - Config.capacitorBankMaxStorageRF * 8, + false, "enderio:capacitorBank", "enderio:capacitorBankSimpleBorder", "enderio:capacitorBankInput", "enderio:capacitorBankOutput", + "enderio:capacitorBankLocked"); + + private static final CapBankType ACTIVATED = new CapBankType("ACTIVATED", "tile.blockCapBank.activated", Config.capacitorBankTierTwoMaxIoRF, + Config.capacitorBankTierTwoMaxStorageRF, + true, + false, "enderio:capacitorBank", "enderio:capacitorBankActivatedBorder", "enderio:capacitorBankInput", "enderio:capacitorBankOutput", + "enderio:capacitorBankLocked"); + + private static final CapBankType VIBRANT = new CapBankType("VIBRANT", "tile.blockCapBank.vibrant", Config.capacitorBankTierThreeMaxIoRF, + Config.capacitorBankTierThreeMaxStorageRF, true, false, "enderio:capacitorBank", "enderio:capacitorBankVibrantBorder", "enderio:capacitorBankInput", "enderio:capacitorBankOutput", "enderio:capacitorBankLocked"); @@ -24,7 +35,8 @@ public class CapBankType { static { TYPES.add(CREATIVE); - TYPES.add(BASIC); + TYPES.add(SIMPLE); + TYPES.add(ACTIVATED); TYPES.add(VIBRANT); } @@ -43,7 +55,7 @@ public class CapBankType { return type; } } - return BASIC; + return ACTIVATED; } private final String uid; @@ -123,7 +135,7 @@ public class CapBankType { public static CapBankType readTypeFromNBT(NBTTagCompound nbtRoot) { if(nbtRoot == null || !nbtRoot.hasKey("type")) { - return BASIC; + return ACTIVATED; } return getTypeFromUID(nbtRoot.getString("type")); } diff --git a/src/main/java/crazypants/enderio/machine/capbank/render/FillGauge.java b/src/main/java/crazypants/enderio/machine/capbank/render/FillGauge.java index b19bffa5..d56ba1d6 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/render/FillGauge.java +++ b/src/main/java/crazypants/enderio/machine/capbank/render/FillGauge.java @@ -11,6 +11,7 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import crazypants.enderio.EnderIO; +import crazypants.enderio.machine.capbank.CapBankType; import crazypants.enderio.machine.capbank.InfoDisplayType; import crazypants.enderio.machine.capbank.TileCapBank; import crazypants.enderio.machine.capbank.network.CapBankClientNetwork; @@ -132,7 +133,7 @@ public class FillGauge implements IInfoRenderer { boolean found = true; while (found) { loc = loc.getLocation(ForgeDirection.UP); - if(isGaugeType(cb.getWorldObj(), loc, dir)) { + if(isGaugeType(cb.getWorldObj(), loc, dir, cb.getType())) { height++; } else { found = false; @@ -143,7 +144,7 @@ public class FillGauge implements IInfoRenderer { found = true; while (found) { loc = loc.getLocation(ForgeDirection.DOWN); - if(isGaugeType(cb.getWorldObj(), loc, dir)) { + if(isGaugeType(cb.getWorldObj(), loc, dir, cb.getType())) { height++; yPos++; } else { @@ -155,24 +156,11 @@ public class FillGauge implements IInfoRenderer { } - // private Type getType(TileCapBank cb, ForgeDirection dir) { - // boolean hasAbove = isGaugeType(cb.getWorldObj(), cb.getLocation().getLocation(ForgeDirection.UP), dir); - // boolean hasBellow = isGaugeType(cb.getWorldObj(), cb.getLocation().getLocation(ForgeDirection.DOWN), dir); - // - // if(!hasAbove && !hasBellow) { - // return Type.SINGLE; - // } else if(hasAbove && !hasBellow) { - // return Type.TOP; - // } else if(!hasAbove && hasBellow) { - // return Type.BOTTOM; - // } - // return Type.MIDDLE; - // } - - private boolean isGaugeType(World worldObj, BlockCoord bc, ForgeDirection face) { + private boolean isGaugeType(World worldObj, BlockCoord bc, ForgeDirection face, CapBankType type) { TileEntity te = worldObj.getTileEntity(bc.x, bc.y, bc.z); if(te instanceof TileCapBank) { - return ((TileCapBank) te).getDisplayType(face) == InfoDisplayType.LEVEL_BAR; + TileCapBank cb = (TileCapBank) te; + return type == cb.getType() && cb.getDisplayType(face) == InfoDisplayType.LEVEL_BAR; } return false; } From ab55afbc5957a746ca89ac06a2e8ff99d1a1a380 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Sat, 6 Dec 2014 14:31:00 +0800 Subject: [PATCH 11/12] Item rendering now shows fill bar. Added recipes and deprecated old block. --- resources/assets/enderio/lang/en_US.lang | 10 +-- .../blocks/capacitorBankCreativeBorder.png | Bin 971 -> 1453 bytes .../textures/blocks/capacitorBankSimple.png | Bin 0 -> 1338 bytes .../blocks/capacitorBankSimpleBorder.png | Bin 918 -> 964 bytes .../enderio/machine/ClearConfigRecipe.java | 12 ++-- .../enderio/machine/MachineRecipes.java | 25 +++++-- .../enderio/machine/capbank/CapBankType.java | 17 +++-- .../machine/capbank/ConvertOldRecipe.java | 63 ++++++++++++++++++ .../capbank/network/CapBankClientNetwork.java | 4 ++ .../capbank/render/CapBankRenderer.java | 19 +++++- .../machine/capbank/render/FillGauge.java | 28 ++++---- .../machine/power/BlockCapacitorBank.java | 2 + .../java/crazypants/render/RenderUtil.java | 32 +++++++-- 13 files changed, 171 insertions(+), 41 deletions(-) create mode 100644 resources/assets/enderio/textures/blocks/capacitorBankSimple.png create mode 100644 src/main/java/crazypants/enderio/machine/capbank/ConvertOldRecipe.java diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 14f3b591..308c8d6c 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -253,14 +253,14 @@ item.itemWirelessLightInverted.tooltip.detailed.line2=power. item.itemWirelessLightInverted.tooltip.detailed.line3=Turn off with a redstone signal. item.itemWirelessLightInverted.tooltip.detailed.line4=Can receive power from wireless chargers. -tile.blockCapacitorBank.name=Capacitor Bank -tile.blockCapacitorBank.creative.name=Creative Capacitor Bank -tile.blockCapacitorBank.tooltip.detailed.line1=Multi-block energy storage. -tile.blockCapacitorBank.tooltip.detailed.line2=Can charge RF powered items. +tile.blockCapacitorBank.name=Capacitor Bank (Deprecated) +tile.blockCapacitorBank.creative.name=Creative Capacitor Bank (Deprecated) +tile.blockCapacitorBank.tooltip.detailed.line1=Convert to new block by placing +tile.blockCapacitorBank.tooltip.detailed.line2=in a crafting grid tile.blockCapacitorBank.tooltipPrefix=Contains tile.blockCapBank.creative.name=Creative Capacitor Bank -tile.blockCapBank.simple.name=Simple Capacitor Bank +tile.blockCapBank.simple.name=Basic Capacitor Bank tile.blockCapBank.activated.name=Capacitor Bank tile.blockCapBank.vibrant.name=Vibrant Capacitor Bank tile.blockCapBank.tooltip.detailed.line1=Multi-block energy storage. diff --git a/resources/assets/enderio/textures/blocks/capacitorBankCreativeBorder.png b/resources/assets/enderio/textures/blocks/capacitorBankCreativeBorder.png index 1ade6a6faa8b8173a6fbcfceff17d92cede47e2c..3a86d8449f404754f4c5da50b2168c3d78cbf8c5 100644 GIT binary patch delta 1374 zcmV-k1)=)O2dxW`JPN!301mtXmArCEkwz$g1u02HK~zXfeU|5T>PQfTc_!O{O%Osk zBfvRhz&PT&@Be4No*4yv_U<`#KpIe0cXdyXI?JPzi<91Ew|~_;z3vZgPQkDRS-I|? zfvaQrkH+OuPtff*IO;XOcKdLiA9o?|@O6252FvZ)=zchU7)>6>23$XktotDt-}Q%o zcZ1PwkH0D5t~_#xAwOwwd(}Hb2J#MH+&@|N%hcVt!K)v>`jLSXY`u`h^~8O#oR#ga zZ0C7oKUveK;e7zXrfkTVbpX%_V(Hg*IvfE@^t>2Y=wJE*mrv_{2FuE|H1n*vka)FrWwFD9ZYy?z=Re2?ef0pMYL7P%qBfyk?99S|{^pF|L%rbMP8Zy5H>IS7d zXQk>+iCxQ}M+OfQTXr&oo6&kVkU`y=hytVWKLYIA4EEV)P8XFLEW*AGBSyvbU?}H- z8mL2c2G~HRu{C|PJ+1M7SAi^NLqYdmNaJgWTv|xR_425DaUx|tl^R<38JydO*WQB3I&*v0T>3>*zj$_l#|YOs#d2ghg9aaMMJmffBbFl8_TQVfUi z$<&w=#e~np_=|wn09?RZQ*Yu7_EiwyPdy4CCz?9+In9kg&92?w1R>^Vb{#$f&^5f- zyr$mH%S|~0&wg}gyBCA;MIVby27{ZSalc(#%+c1j*=w|^2^{M6tau5NRi52WoU5~e z5;&3~U!9Hb#?m~06z4xWr(&-Kbl|Uxd7E9RgBXnif$FtocyBqh4ea8(a)#J{u^WLX zlfctbJFabkSHdrH@SLSBfu6ihNefxBxy1LXs!&VUw*uGKZD-o-e-St~JDH{=aGcRq zt=V#i_@% delta 888 zcmV-;1Bd*r3(E(PJPN%401mwYNBfYikwz$g14l_jK~zXfmDcN0Yc~*tQNRBKnoB`K z3OIq{W{N!oIkFNG=y5U$6Xb6* z+IlO^{r!F7D_`EJoSvSZpP&Evl^-4Pv$Hb^i1EqENxX~1gICp%CBBOK<>lqg&CUIP z{r$tk!(S6#1@G?eZf|cTTwh;bU0q4uiKgILSsBX8m%5_<`1ttu#M9H0NZD*Qn>fX6 zCPA%1gpIn1uZ)G8D6Qw`=hxTQx3@Q+FE1}%%ch*bsbGx6`XH7p z<3Z$$K`pZESv}=Pu`lXa)o$80bPRMU^}s-@iD?GerWU>W?350PXp)fRMfqWWX<$Fu zw)&^%PU(<%8Enr_h{2emoMd-^vo>Tp#x%}SKTQcn9V!1C0~HJd*M%>`alUEwqu%I; z|MT?6V=n(214tX&G?yK>Tq*5l={HFp%I0SVwL6D!$EzGm+fK5JJIlb(IQnfkD39+) zkU-5fK54n{n8-B26@(`i=U8o+0_q@5%GvkJgj`wYn>TTFN1jG zA&5f}ic@sEt{EI29x||(;t>NGWw2d7hUAARG)aJb3U0dggR{4{$Do#BHdv@H42m|Q z>B^F?7ZF7_1Ha3&L8)iY5hndhIr_;>x$G+LH83^%z7Nt@4kHfX){KPqq+)EUfI3#*myyd{KMY zVNfSoG#NU~>ho4X;#GTe5or_P`O6fQfo2u?j6pnxYG;<7MPb}TQB~S9p9Y??g=+6h zqLPUUnT;;n`b(n~^eSv)6FSN@=a!cE=OQn5QJiKHEX8OQ{fxH%vecDpTPmOU=f7(c z#Rkk}$Xg%?tw|$MI7S7XOb&I2tQmNUhX%-)NuMG)kiQes)S|v#um1z-w<$N2bPDNB8 zb~7$DE-^7j^FlWO00g#4L_t(YOMRB-lH)iGg#B_mJHa!yl9jXNyzl?_J^-X7`);qQ z%YhQRfhGWH^J};J9R%-T_z^{4N&J;0+rt9>g3mYxA92JzhW98GgeyeC;I4)toNxO* z2LB{%bmVT${Ha%<)Ao=pzGc+K(df@M8EHaR9_~L(1 zmT}XheU}YGK00Jz=vhpng0u0F*0KC5vHIMRK)bg~%+G4PV60=CtpN z<5-@i%A=f)tccPuaP^={2}&xqf~>H9=vo6S$PhQ=8_dOoL)XDopHI!@(p)d{c{%fU zkvWbel#Edfc=ZG)wdZ_vSRVuY)`Ub@>AwAU*#_2pchPvlgH#?ds? zH?dCO%p4{4=~zyd_rwYsyDWoT1cI_)iFk$me(P>G5x87j1}Xr%!8DY2fEQt?xve^# z#DKHp%?d$q3|j;^bk2nP@C54K3A}{w*dcZ7LM>4*)R%L6xv-JXnqA{a5kkHQ!00nj zf6nJ8b~DEd%WWJE&%l_?{j8h;fKi&VqO2>8nhH>cB~ZGUXoAz+UL zW~x4Ia?wzkxULcorft%$C8C@%8;5dr22O)dg{-hXP31U7RYeKOxPII3-ot=n;Hh95 zDj*rewF^J9@P~n;L!fd39!kmz-3v9y`#vg5CLPbp&D%}{v>W6YoPheH;d^t0eUSb1 zun35T;t20dUGPBc`?PJtqTm4JiN8B$?B;&jb!v{VTlgYi8uo(~PhD_l*MURR z1e6eu%phSu~FdoFVX8 z;9uq_FEy^z!mExuUZn;J0<1U9jy9e%z#`h3>1r0q@vknDvC9bZaqu7kg!1+=5fC(z>yuv04 z;mf^L?hb9vNbkHCV wE&%R8Y=-Vx!M~&9zzp^-fLddR{nu{y51AfICxGfEegFUf07*qoM6N<$f?z;+)Bpeg literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/capacitorBankSimpleBorder.png b/resources/assets/enderio/textures/blocks/capacitorBankSimpleBorder.png index 986f95001322ac730bc21bef41b3998d605f6b7a..780659c419ff97e230741dfc589423bccc26aacc 100644 GIT binary patch delta 853 zcmV-b1FHO%2gC=Ee19`ZL_t(YOP!aAa@sHyMfv~VNdp8D0%^zsq-;Z2N)nbXKnwka z9{CC(EQ38cGbOV0tS8<3EW5c%rBW`J^ZERj2pYv=k)E5In`*UscX#*oEVWvVU~Yk{ zfKsWHBf^In@9*y)A0MBepPS8QtJQjWdHEJW1L&b&&~7vu^?!PuOx)$eR4maXU@qcb zUthoPd3$?%e}A9NX7l-cu~;mZOMV4C3=!a%PN&>53F!CxWWBz=&OJRnbvm7okB{Gb zR;$%|z20m#e*)+y;8zC7%F@|Hjt#PL)@4T`lqnG#k;WkbP9itgNO7JYCt%1b=rJ0N zaKd=NKg7ZVRDWV0r(jgB#GunT0oH-Z1ld_WWoZ(SiiD)q4T&(MeFz0BJ|zJXQE$UBQ7Tl3ght1odnBvi(h8JOqF5D0b$FD?=QBq|tcuKW zv&Y7MibDb<;!Nk-l#7Q|!NU$jxE`y>G4zkeV=EE=!n24r9?DGNY!{{sJd;_UP6(h) zKkox;GJgq3rLzb$omQb`3NDof6u>W;l;c!_i;D{*5pOhZ(5Y|={10uHPoYrsuwsPa zwQOEE?RJ|r{yPgfR9!L1nph6(4%bA|Kfh z!jKguKoapSW2@-YSp+yKR|RdsrZJP1`8c0BDt~wgjLE7ZokhA$=n|Ne#p=w^sZ$CiDIzdbiuTS@`AB7ElD23SgA< zr@VEr4}`I0swz@x`>1||?TSd99S#X_m^T_G`y!q}VId50{y4hbE}s*oiul9BOd7TV zq)rWC6!fJ{3{MazCD0IbGRjmA9AVwR f`wxK6<>lpn(?mlBos~NG00000NkvXXu0mjf%L9w> delta 807 zcmV+?1K9k;2bKqre18Q=L_t(YOO4ivRvSAIgke9R*+L)?mO$WUd;bT>H!8U;Yix4= zbHJlkt4eB(WN)_H?fLon#l^+t<>l4Y)u&^KLqZ{cP48>HG|$e?h;MvoQ@OsrzPY)% zy}kXi!!rc&xgiH}U6WpTjt%im)bH-@9v&W^o}RuP^8EZP_<#8LsP}8*{{CL_QFH~* zW)_c)51vNSdU<*IKJfbbDzbJevyce%2G4A=j*a4~fWfrh-roM(@&5j`d1?bm<u9%Or#wD3h({qPL9(q~?jl!qE>w#MY|81M1|c@cvo1sWWmjJ~3@rlXaZ0@m;*p0S z4rwN5(tpc!ov%z*+VP0NIDP8V^wA}EqR=G)k|~(<@`Y0d*@n?zJ$;lxv8?Fu^cY2i z=H8(8d7A!OJ(Moe6>0e}kQ7bI2P-&QoV9w9c%-AA6&tSFdxLB;&q-Zs8Fa~kNRR3; z3I_)D7MZ>djM6xz9)n5R%wU!W2A*;bvazKem47Zdkoa01Ckw6g&Qt&Z002ovPDHLkV1mrrf+_$2 diff --git a/src/main/java/crazypants/enderio/machine/ClearConfigRecipe.java b/src/main/java/crazypants/enderio/machine/ClearConfigRecipe.java index 6621c7f3..4c890081 100644 --- a/src/main/java/crazypants/enderio/machine/ClearConfigRecipe.java +++ b/src/main/java/crazypants/enderio/machine/ClearConfigRecipe.java @@ -1,7 +1,5 @@ package crazypants.enderio.machine; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import crazypants.util.Lang; import net.minecraft.block.Block; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; @@ -12,8 +10,10 @@ import net.minecraft.world.World; import net.minecraftforge.event.entity.player.ItemTooltipEvent; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import crazypants.util.Lang; -public class ClearConfigRecipe implements IRecipe{ +public class ClearConfigRecipe implements IRecipe { static { RecipeSorter.register("EnderIO:clearConfig", ClearConfigRecipe.class, Category.SHAPELESS, "after:minecraft:shapeless"); @@ -39,9 +39,9 @@ public class ClearConfigRecipe implements IRecipe{ out.stackTagCompound = new NBTTagCompound(); out.stackTagCompound.setBoolean("clearedConfig", true); out.stackSize = 1; - this.output = out; + output = out; } else { - this.output = null; + output = null; } return count == 1 && output != null; @@ -64,7 +64,7 @@ public class ClearConfigRecipe implements IRecipe{ @SubscribeEvent public void onTooltip(ItemTooltipEvent event) { - if (this.output != null && ItemStack.areItemStacksEqual(output, event.itemStack)) { + if (output != null && ItemStack.areItemStacksEqual(output, event.itemStack)) { event.toolTip.add(EnumChatFormatting.RED.toString() + EnumChatFormatting.ITALIC + Lang.localize("machine.tooltip.clearConfig", true)); } } diff --git a/src/main/java/crazypants/enderio/machine/MachineRecipes.java b/src/main/java/crazypants/enderio/machine/MachineRecipes.java index d9fae646..0d24f9b3 100644 --- a/src/main/java/crazypants/enderio/machine/MachineRecipes.java +++ b/src/main/java/crazypants/enderio/machine/MachineRecipes.java @@ -10,6 +10,8 @@ import cpw.mods.fml.common.registry.GameRegistry; import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; import crazypants.enderio.item.skull.BlockEndermanSkull; +import crazypants.enderio.machine.capbank.CapBankType; +import crazypants.enderio.machine.capbank.ConvertOldRecipe; import crazypants.enderio.machine.light.BlockItemElectricLight; import crazypants.enderio.material.Alloy; import crazypants.enderio.material.FrankenSkull; @@ -129,13 +131,22 @@ public class MachineRecipes { GameRegistry.addShapedRecipe(still, "eve", "tmt", "efe", 'v', Items.cauldron, 'm', machineChassi, 'e', electricSteel, 'f', Blocks.furnace, 't', basicTank); //capacitor bank - ItemStack capacitorBank = new ItemStack(EnderIO.blockCapacitorBank, 1, 0); - if(Config.useHardRecipes) { - GameRegistry.addRecipe(new ShapedOreRecipe(capacitorBank, "rcr", "ccc", "rMr", 'm', electricSteel, 'c', capacitor2, 'r', Blocks.redstone_block, 'M', - machineChassi)); - } else { - GameRegistry.addRecipe(new ShapedOreRecipe(capacitorBank, "mcm", "crc", "mcm", 'm', electricSteel, 'c', capacitor2, 'r', Blocks.redstone_block)); - } + // ItemStack capacitorBank = new ItemStack(EnderIO.blockCapacitorBank, 1, 0); + // if(Config.useHardRecipes) { + // GameRegistry.addRecipe(new ShapedOreRecipe(capacitorBank, "rcr", "ccc", "rMr", 'm', electricSteel, 'c', capacitor2, 'r', Blocks.redstone_block, 'M', + // machineChassi)); + // } else { + // GameRegistry.addRecipe(new ShapedOreRecipe(capacitorBank, "mcm", "crc", "mcm", 'm', electricSteel, 'c', capacitor2, 'r', Blocks.redstone_block)); + // } + ItemStack capBank = new ItemStack(EnderIO.blockCapBank, 1, CapBankType.getMetaFromType(CapBankType.SIMPLE)); + GameRegistry.addShapedRecipe(capBank, "bcb", "cmc", "bcb", 'b', Items.iron_ingot, 'c', capacitor, 'm', Blocks.redstone_block); + capBank = new ItemStack(EnderIO.blockCapBank, 1, CapBankType.getMetaFromType(CapBankType.ACTIVATED)); + GameRegistry.addShapedRecipe(capBank, "bcb", "cmc", "bcb", 'b', electricSteel, 'c', capacitor2, 'm', Blocks.redstone_block); + capBank = new ItemStack(EnderIO.blockCapBank, 1, CapBankType.getMetaFromType(CapBankType.VIBRANT)); + GameRegistry.addShapedRecipe(capBank, "bcb", "cmc", "bcb", 'b', electricSteel, 'c', capacitor3, 'm', vibCry); + + ConvertOldRecipe convertRecipe = new ConvertOldRecipe(); + GameRegistry.addRecipe(convertRecipe); //painter ItemStack painter = new ItemStack(EnderIO.blockPainter, 1, 0); diff --git a/src/main/java/crazypants/enderio/machine/capbank/CapBankType.java b/src/main/java/crazypants/enderio/machine/capbank/CapBankType.java index 8cf3aa6b..77c454b5 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/CapBankType.java +++ b/src/main/java/crazypants/enderio/machine/capbank/CapBankType.java @@ -9,24 +9,24 @@ import crazypants.enderio.config.Config; public class CapBankType { - private static final CapBankType CREATIVE = new CapBankType("CREATIVE", "tile.blockCapBank.creative", 500000, Config.capacitorBankTierTwoMaxStorageRF, false, + public static final CapBankType CREATIVE = new CapBankType("CREATIVE", "tile.blockCapBank.creative", 500000, Config.capacitorBankTierTwoMaxStorageRF, false, true, "enderio:capacitorBank", "enderio:capacitorBankCreativeBorder", "enderio:capacitorBankInput", "enderio:capacitorBankOutput", "enderio:capacitorBankLocked"); - private static final CapBankType SIMPLE = new CapBankType("SIMPLE", "tile.blockCapBank.simple", Config.capacitorBankTierOneMaxIoRF, + public static final CapBankType SIMPLE = new CapBankType("SIMPLE", "tile.blockCapBank.simple", Config.capacitorBankTierOneMaxIoRF, Config.capacitorBankTierOneMaxStorageRF, true, false, "enderio:capacitorBank", "enderio:capacitorBankSimpleBorder", "enderio:capacitorBankInput", "enderio:capacitorBankOutput", "enderio:capacitorBankLocked"); - private static final CapBankType ACTIVATED = new CapBankType("ACTIVATED", "tile.blockCapBank.activated", Config.capacitorBankTierTwoMaxIoRF, + public static final CapBankType ACTIVATED = new CapBankType("ACTIVATED", "tile.blockCapBank.activated", Config.capacitorBankTierTwoMaxIoRF, Config.capacitorBankTierTwoMaxStorageRF, true, false, "enderio:capacitorBank", "enderio:capacitorBankActivatedBorder", "enderio:capacitorBankInput", "enderio:capacitorBankOutput", "enderio:capacitorBankLocked"); - private static final CapBankType VIBRANT = new CapBankType("VIBRANT", "tile.blockCapBank.vibrant", Config.capacitorBankTierThreeMaxIoRF, + public static final CapBankType VIBRANT = new CapBankType("VIBRANT", "tile.blockCapBank.vibrant", Config.capacitorBankTierThreeMaxIoRF, Config.capacitorBankTierThreeMaxStorageRF, true, false, "enderio:capacitorBank", "enderio:capacitorBankVibrantBorder", "enderio:capacitorBankInput", "enderio:capacitorBankOutput", "enderio:capacitorBankLocked"); @@ -44,6 +44,15 @@ public class CapBankType { return TYPES; } + public static int getMetaFromType(CapBankType type) { + for (int i = 0; i < TYPES.size(); i++) { + if(TYPES.get(i) == type) { + return i; + } + } + return 1; + } + public static CapBankType getTypeFromMeta(int meta) { meta = MathHelper.clamp_int(meta, 0, TYPES.size() - 1); return types().get(meta); diff --git a/src/main/java/crazypants/enderio/machine/capbank/ConvertOldRecipe.java b/src/main/java/crazypants/enderio/machine/capbank/ConvertOldRecipe.java new file mode 100644 index 00000000..02604b34 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/capbank/ConvertOldRecipe.java @@ -0,0 +1,63 @@ +package crazypants.enderio.machine.capbank; + +import net.minecraft.block.Block; +import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.world.World; +import net.minecraftforge.oredict.RecipeSorter; +import net.minecraftforge.oredict.RecipeSorter.Category; +import crazypants.enderio.EnderIO; +import crazypants.enderio.power.PowerHandlerUtil; + +public class ConvertOldRecipe implements IRecipe { + + static { + RecipeSorter.register("EnderIO:convertOldCapBankRecipe", ConvertOldRecipe.class, Category.SHAPELESS, "after:minecraft:shapeless"); + } + + private ItemStack output; + + @Override + public boolean matches(InventoryCrafting inv, World world) { + ItemStack input = null; + for (int i = 0; i < inv.getSizeInventory(); i++) { + ItemStack checkStack = inv.getStackInSlot(i); + if(checkStack != null) { + if(input != null) { + return false; + } + if(Block.getBlockFromItem(checkStack.getItem()) == EnderIO.blockCapacitorBank) { + input = checkStack; + } else { + return false; + } + } + } + + if(input == null) { + return false; + } + + output = new ItemStack(EnderIO.blockCapBank, 1, CapBankType.getMetaFromType(CapBankType.ACTIVATED)); + PowerHandlerUtil.setStoredEnergyForItem(output, PowerHandlerUtil.getStoredEnergyForItem(input)); + return true; + + } + + @Override + public ItemStack getCraftingResult(InventoryCrafting inv) { + return output.copy(); + } + + @Override + public int getRecipeSize() { + return 1; + } + + @Override + public ItemStack getRecipeOutput() { + return output; + } + +} diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/CapBankClientNetwork.java b/src/main/java/crazypants/enderio/machine/capbank/network/CapBankClientNetwork.java index 840d542e..018ef7a2 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/network/CapBankClientNetwork.java +++ b/src/main/java/crazypants/enderio/machine/capbank/network/CapBankClientNetwork.java @@ -113,6 +113,10 @@ public class CapBankClientNetwork implements ICapBankNetwork { return maxEnergyStored; } + public void setMaxEnergyStoredL(long maxEnergyStored) { + this.maxEnergyStored = maxEnergyStored; + } + public void setEnergyStored(long energyStored) { this.energyStored = energyStored; } diff --git a/src/main/java/crazypants/enderio/machine/capbank/render/CapBankRenderer.java b/src/main/java/crazypants/enderio/machine/capbank/render/CapBankRenderer.java index a37734bc..45910f4c 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/render/CapBankRenderer.java +++ b/src/main/java/crazypants/enderio/machine/capbank/render/CapBankRenderer.java @@ -23,6 +23,10 @@ import crazypants.enderio.machine.capbank.BlockCapBank; import crazypants.enderio.machine.capbank.CapBankType; import crazypants.enderio.machine.capbank.InfoDisplayType; import crazypants.enderio.machine.capbank.TileCapBank; +import crazypants.enderio.machine.capbank.network.CapBankClientNetwork; +import crazypants.enderio.machine.capbank.render.FillGauge.GaugeInfo; +import crazypants.enderio.machine.capbank.render.FillGauge.GaugeKey; +import crazypants.enderio.power.PowerHandlerUtil; import crazypants.render.ConnectedTextureRenderer; import crazypants.render.CubeRenderer; import crazypants.render.CustomCubeRenderer; @@ -33,12 +37,14 @@ public class CapBankRenderer extends TileEntitySpecialRenderer implements ISimpl private ConnectedTextureRenderer connectedTexRenderer; private Map infoRenderers; + private FillGauge fillGaugeRenderer; public CapBankRenderer() { connectedTexRenderer = new ConnectedTextureRenderer(); connectedTexRenderer.setMatchMeta(true); + fillGaugeRenderer = new FillGauge(); infoRenderers = new HashMap(); - infoRenderers.put(InfoDisplayType.LEVEL_BAR, new FillGauge()); + infoRenderers.put(InfoDisplayType.LEVEL_BAR, fillGaugeRenderer); infoRenderers.put(InfoDisplayType.IO, new IoDisplay()); } @@ -106,6 +112,17 @@ public class CapBankRenderer extends TileEntitySpecialRenderer implements ISimpl GL11.glDisable(GL11.GL_POLYGON_OFFSET_FILL); + + CapBankClientNetwork nw = new CapBankClientNetwork(-1); + nw.setMaxEnergyStoredL(CapBankType.getTypeFromMeta(item.getItemDamage()).getMaxEnergyStored()); + nw.setEnergyStored(PowerHandlerUtil.getStoredEnergyForItem(item)); + + GaugeInfo gi = new GaugeInfo(1, 0); + GaugeKey key = new GaugeKey(ForgeDirection.SOUTH, FillGauge.Type.SINGLE); + fillGaugeRenderer.doRender(nw, RenderUtil.BRIGHTNESS_MAX, gi, key); + // key = new GaugeKey(ForgeDirection.EAST, FillGauge.Type.SINGLE); + // fillGaugeRenderer.doRender(nw, RenderUtil.BRIGHTNESS_MAX, gi, key); + } private void renderBorder(IBlockAccess blockAccess, int x, int y, int z, int meta) { diff --git a/src/main/java/crazypants/enderio/machine/capbank/render/FillGauge.java b/src/main/java/crazypants/enderio/machine/capbank/render/FillGauge.java index d56ba1d6..50451da0 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/render/FillGauge.java +++ b/src/main/java/crazypants/enderio/machine/capbank/render/FillGauge.java @@ -50,33 +50,33 @@ public class FillGauge implements IInfoRenderer { @Override public void render(TileCapBank cb, ForgeDirection dir, double x, double y, double z, float partialTick) { - if(gaugeVertexCache == null) { - createVertexCache(); - } + CapBankClientNetwork nw = null; if(cb.getNetwork() != null) { nw = (CapBankClientNetwork) cb.getNetwork(); nw.requestPowerUpdate(cb, 20); } - - RenderUtil.bindBlockTexture(); - int brightness = cb.getWorldObj().getLightBrightnessForSkyBlocks(cb.xCoord + dir.offsetX, cb.yCoord + dir.offsetY, cb.zCoord + dir.offsetZ, 0); + GaugeInfo info = getGaugeInfo(cb, dir); + GaugeKey key = new GaugeKey(dir, info.type); + doRender(nw, brightness, info, key); + } + + public void doRender(CapBankClientNetwork nw, int brightness, GaugeInfo info, GaugeKey key) { + if(gaugeVertexCache == null) { + createVertexCache(); + } + RenderUtil.bindBlockTexture(); Tessellator tes = Tessellator.instance; tes.startDrawingQuads(); tes.setBrightness(brightness); tes.setColorOpaque_F(1, 1, 1); - - GaugeInfo info = getGaugeInfo(cb, dir); - GaugeKey key = new GaugeKey(dir, info.type); List verts = gaugeVertexCache.get(key); RenderUtil.addVerticesToTessellator(verts, Tessellator.instance); renderFillBar(key, nw, info); - tes.draw(); - } private void renderFillBar(GaugeKey key, CapBankClientNetwork nw, GaugeInfo info) { @@ -222,7 +222,7 @@ public class FillGauge implements IInfoRenderer { return res; } - private static class GaugeInfo { + static class GaugeInfo { int height; int yPosition; @@ -249,12 +249,12 @@ public class FillGauge implements IInfoRenderer { } - private static class GaugeKey { + static class GaugeKey { ForgeDirection dir; Type type; - public GaugeKey(ForgeDirection dir, Type type) { + GaugeKey(ForgeDirection dir, Type type) { this.dir = dir; this.type = type; } diff --git a/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java b/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java index 3d90da3a..5df96ef3 100644 --- a/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java +++ b/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java @@ -63,6 +63,7 @@ public class BlockCapacitorBank extends BlockEio implements IGuiHandler, IAdvanc protected BlockCapacitorBank() { super(ModObject.blockCapacitorBank.unlocalisedName, TileCapacitorBank.class); setHardness(2.0F); + setCreativeTab(null); } @Override @@ -397,6 +398,7 @@ public class BlockCapacitorBank extends BlockEio implements IGuiHandler, IAdvanc tooltip.add(String.format("%s : %s%s%sRF/t ", Lang.localize("capbank.maxIO"), format, fmt.format(cap.getMaxIO()), Util.TAB + Util.ALIGNRIGHT)); tooltip.add(String.format("%s : %s%s%sRF/t ", Lang.localize("capbank.maxIn"), format, fmt.format(cap.getMaxInput()), Util.TAB + Util.ALIGNRIGHT)); tooltip.add(String.format("%s : %s%s%sRF/t ", Lang.localize("capbank.maxOut"), format, fmt.format(cap.getMaxOutput()), Util.TAB + Util.ALIGNRIGHT)); + tooltip.add("Deprecated. Convert by placing in crafting grid"); } } diff --git a/src/main/java/crazypants/render/RenderUtil.java b/src/main/java/crazypants/render/RenderUtil.java index bb189131..0d0f5fb8 100644 --- a/src/main/java/crazypants/render/RenderUtil.java +++ b/src/main/java/crazypants/render/RenderUtil.java @@ -1,7 +1,29 @@ package crazypants.render; -import static net.minecraftforge.common.util.ForgeDirection.*; -import static org.lwjgl.opengl.GL11.*; +import static net.minecraftforge.common.util.ForgeDirection.DOWN; +import static net.minecraftforge.common.util.ForgeDirection.EAST; +import static net.minecraftforge.common.util.ForgeDirection.NORTH; +import static net.minecraftforge.common.util.ForgeDirection.SOUTH; +import static net.minecraftforge.common.util.ForgeDirection.UP; +import static net.minecraftforge.common.util.ForgeDirection.WEST; +import static org.lwjgl.opengl.GL11.GL_ALL_ATTRIB_BITS; +import static org.lwjgl.opengl.GL11.GL_ALPHA_TEST; +import static org.lwjgl.opengl.GL11.GL_BLEND; +import static org.lwjgl.opengl.GL11.GL_CULL_FACE; +import static org.lwjgl.opengl.GL11.GL_ONE; +import static org.lwjgl.opengl.GL11.GL_ONE_MINUS_SRC_ALPHA; +import static org.lwjgl.opengl.GL11.GL_SMOOTH; +import static org.lwjgl.opengl.GL11.GL_SRC_ALPHA; +import static org.lwjgl.opengl.GL11.GL_TEXTURE_2D; +import static org.lwjgl.opengl.GL11.GL_ZERO; +import static org.lwjgl.opengl.GL11.glDepthMask; +import static org.lwjgl.opengl.GL11.glDisable; +import static org.lwjgl.opengl.GL11.glEnable; +import static org.lwjgl.opengl.GL11.glPopAttrib; +import static org.lwjgl.opengl.GL11.glPushAttrib; +import static org.lwjgl.opengl.GL11.glRotatef; +import static org.lwjgl.opengl.GL11.glShadeModel; +import static org.lwjgl.opengl.GL11.glTranslatef; import java.nio.FloatBuffer; import java.util.ArrayList; @@ -61,6 +83,8 @@ public class RenderUtil { public static final ResourceLocation GLINT_TEX = new ResourceLocation("textures/misc/enchanted_item_glint.png"); + public static int BRIGHTNESS_MAX = 15 << 20 | 15 << 4; + public static void loadMatrix(Matrix4d mat) { MATRIX_BUFFER.rewind(); MATRIX_BUFFER.put((float) mat.m00); @@ -598,8 +622,8 @@ public class RenderUtil { RenderHelper.disableStandardItemLighting(); OpenGlHelper.glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ZERO); // stop random disappearing - float width = (float) fnt.getStringWidth(toRender); - float height = (float) fnt.FONT_HEIGHT; + float width = fnt.getStringWidth(toRender); + float height = fnt.FONT_HEIGHT; float padding = 2f; Tessellator tessellator = Tessellator.instance; tessellator.startDrawingQuads(); From b7d89dbc45f0de820d638165f4ae688e6096b796 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Sat, 6 Dec 2014 14:33:28 +0800 Subject: [PATCH 12/12] Added comparator update --- .../crazypants/enderio/machine/capbank/TileCapBank.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java index 146f5993..777f76bc 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java @@ -77,6 +77,7 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor private boolean dropItems; private boolean displayTypesDirty; private boolean revalidateDisplayTypes; + private int lastComparatorState; @Override public BlockCoord getLocation() { @@ -198,7 +199,13 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerReceptor if(displayTypesDirty) { displayTypesDirty = false; worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + } + // update any comparators, since they don't check themselves + int comparatorState = getComparatorOutput(); + if(lastComparatorState != comparatorState) { + worldObj.func_147453_f(xCoord, yCoord, zCoord, getBlockType()); + lastComparatorState = comparatorState; } doDropItems();