AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-13 09:18:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Updated to new Waila API, closes #1559.

Browse Source
This commit is contained in:
Florian Nücke 2016-01-31 20:13:20 +01:00
parent 69b5a895ee
commit 16b137b40c
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.properties
View File

@ -44,7 +44,7 @@ rotc.version=V5c
tis3d.version=MC1.7.10-0.7.0.50 tis3d.version=MC1.7.10-0.7.0.50
tmech.version=75.0afb56c tmech.version=75.0afb56c
re.version=3.0.0.342 re.version=3.0.0.342
waila.version=1.6.0_B1_1.8.1 waila.version=1.6.0-B2_1.8
wrcbe.version=1.4.1.2 wrcbe.version=1.4.1.2
cofhcore.cf=2246/697 cofhcore.cf=2246/697
cofhcore.version=[1.7.10]3.0.3B4-302-dev cofhcore.version=[1.7.10]3.0.3B4-302-dev

14
src/main/scala/li/cil/oc/integration/waila/BlockDataProvider.scala
View File

@ -1,5 +1,7 @@
package li.cil.oc.integration.waila package li.cil.oc.integration.waila
import java.util
import li.cil.oc.Localization import li.cil.oc.Localization
import li.cil.oc.OpenComputers import li.cil.oc.OpenComputers
import li.cil.oc.api.network.Component import li.cil.oc.api.network.Component
@ -10,13 +12,15 @@ import li.cil.oc.common.block.SimpleBlock
import li.cil.oc.common.tileentity import li.cil.oc.common.tileentity
import li.cil.oc.common.tileentity.traits.NotAnalyzable import li.cil.oc.common.tileentity.traits.NotAnalyzable
import li.cil.oc.util.ExtendedNBT._ import li.cil.oc.util.ExtendedNBT._
import mcp.mobius.waila.api.ITaggedList.ITipList
import mcp.mobius.waila.api._ import mcp.mobius.waila.api._
import net.minecraft.entity.player.EntityPlayerMP
import net.minecraft.item.ItemStack import net.minecraft.item.ItemStack
import net.minecraft.nbt.NBTTagCompound import net.minecraft.nbt.NBTTagCompound
import net.minecraft.nbt.NBTTagString import net.minecraft.nbt.NBTTagString
import net.minecraft.tileentity.TileEntity import net.minecraft.tileentity.TileEntity
import net.minecraft.util.BlockPos
import net.minecraft.util.EnumFacing import net.minecraft.util.EnumFacing
import net.minecraft.world.World
import net.minecraftforge.common.util.Constants.NBT import net.minecraftforge.common.util.Constants.NBT
object BlockDataProvider extends IWailaDataProvider { object BlockDataProvider extends IWailaDataProvider {
@ -35,7 +39,7 @@ object BlockDataProvider extends IWailaDataProvider {
registrar.addConfig(OpenComputers.Name, ConfigComponentName) registrar.addConfig(OpenComputers.Name, ConfigComponentName)
} }
override def getNBTData(tileEntity: TileEntity, tag: NBTTagCompound, accessor: IWailaDataAccessorServer): NBTTagCompound = { override def getNBTData(player: EntityPlayerMP, tileEntity: TileEntity, tag: NBTTagCompound, world: World, blockPos: BlockPos): NBTTagCompound = {
def writeNode(node: Node, tag: NBTTagCompound) = { def writeNode(node: Node, tag: NBTTagCompound) = {
if (node != null && node.reachability != Visibility.None && !tileEntity.isInstanceOf[NotAnalyzable]) { if (node != null && node.reachability != Visibility.None && !tileEntity.isInstanceOf[NotAnalyzable]) {
if (node.address != null) { if (node.address != null) {
@ -106,7 +110,7 @@ object BlockDataProvider extends IWailaDataProvider {
tag tag
} }
override def getWailaBody(stack: ItemStack, tooltip: ITipList, accessor: IWailaDataAccessor, config: IWailaConfigHandler): ITipList = { override def getWailaBody(stack: ItemStack, tooltip: util.List[String], accessor: IWailaDataAccessor, config: IWailaConfigHandler): util.List[String] = {
val tag = accessor.getNBTData val tag = accessor.getNBTData
if (tag == null || tag.hasNoTags) return tooltip if (tag == null || tag.hasNoTags) return tooltip
@ -179,9 +183,9 @@ object BlockDataProvider extends IWailaDataProvider {
override def getWailaStack(accessor: IWailaDataAccessor, config: IWailaConfigHandler) = accessor.getStack override def getWailaStack(accessor: IWailaDataAccessor, config: IWailaConfigHandler) = accessor.getStack
override def getWailaHead(stack: ItemStack, tooltip: ITipList, accessor: IWailaDataAccessor, config: IWailaConfigHandler): ITipList = tooltip override def getWailaHead(stack: ItemStack, tooltip: util.List[String], accessor: IWailaDataAccessor, config: IWailaConfigHandler): util.List[String] = tooltip
override def getWailaTail(stack: ItemStack, tooltip: ITipList, accessor: IWailaDataAccessor, config: IWailaConfigHandler): ITipList = tooltip override def getWailaTail(stack: ItemStack, tooltip: util.List[String], accessor: IWailaDataAccessor, config: IWailaConfigHandler): util.List[String] = tooltip
private def formatTime(seconds: Int) = { private def formatTime(seconds: Int) = {
// Assembly times should not / rarely exceed one hour, so this is good enough. // Assembly times should not / rarely exceed one hour, so this is good enough.