From ab55afbc5957a746ca89ac06a2e8ff99d1a1a380 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Sat, 6 Dec 2014 14:31:00 +0800 Subject: [PATCH] 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();