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

Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10

Browse Source
This commit is contained in:
Florian Nücke 2014-07-23 17:28:57 +02:00
commit c28db39d8c
13 changed files with 47 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/items.psd
View File

Binary file not shown.

1
src/main/resources/assets/opencomputers/lang/de_DE.lang
View File

@ -75,6 +75,7 @@ oc:item.RedstoneCard1.name=Redstonekarte (Stufe 2)
oc:item.Server0.name=Server (Stufe 1)
oc:item.Server1.name=Server (Stufe 2)
oc:item.Server2.name=Server (Stufe 3)
oc:item.Server3.name=Server (Kreativ)
oc:item.Terminal.name=Fernbedienung
oc:item.Transistor.name=Transistor
oc:item.UpgradeAngel.name=Schwebe-Upgrade

1
src/main/resources/assets/opencomputers/lang/en_US.lang
View File

@ -75,6 +75,7 @@ oc:item.RedstoneCard1.name=Redstone Card (Tier 2)
oc:item.Server0.name=Server (Tier 1)
oc:item.Server1.name=Server (Tier 2)
oc:item.Server2.name=Server (Tier 3)
oc:item.Server3.name=Server (Creative)
oc:item.Tablet.name=Tablet
oc:item.Terminal.name=Remote Terminal
oc:item.Transistor.name=Transistor

BIN
src/main/resources/assets/opencomputers/textures/items/ComponentBus.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 408 B

BIN
src/main/resources/assets/opencomputers/textures/items/Server3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 518 B

3
src/main/scala/li/cil/oc/Items.scala
View File

@ -237,5 +237,8 @@ object Items extends ItemAPI {
// Experimental
registerItem(new item.Tablet(multi), "tablet")
// 1.3.2 (cont.)
registerItem(new item.Server(multi, Tier.Four), "serverCreative")
}
}

19
src/main/scala/li/cil/oc/common/InventorySlots.scala
View File

@ -194,6 +194,25 @@ object InventorySlots {
InventorySlot(Slot.HardDiskDrive, Tier.Three),
InventorySlot(Slot.Card, Tier.Two),
InventorySlot(Slot.Card, Tier.Two)
),
Array(
InventorySlot(Slot.Card, Tier.Three),
InventorySlot(Slot.Card, Tier.Three),
InventorySlot(Slot.Processor, Tier.Three),
InventorySlot(Slot.Processor, Tier.Three),
InventorySlot(Slot.Processor, Tier.Three),
InventorySlot(Slot.Processor, Tier.Three),
InventorySlot(Slot.Memory, Tier.Three),
InventorySlot(Slot.Memory, Tier.Three),
InventorySlot(Slot.Memory, Tier.Three),
InventorySlot(Slot.Memory, Tier.Three),
InventorySlot(Slot.HardDiskDrive, Tier.Three),
InventorySlot(Slot.HardDiskDrive, Tier.Three),
InventorySlot(Slot.HardDiskDrive, Tier.Three),
InventorySlot(Slot.HardDiskDrive, Tier.Three),
InventorySlot(Slot.Card, Tier.Three),
InventorySlot(Slot.Card, Tier.Three)
)
)

11
src/main/scala/li/cil/oc/common/container/Server.scala
View File

@ -10,24 +10,25 @@ class Server(playerInventory: InventoryPlayer, serverInventory: ServerInventory)
addSlotToContainer(76, 7 + i * slotSize, slot.slot, slot.tier)
}
for (i <- 0 to 1 + serverInventory.tier) {
val verticalSlots = math.min(3, 1 + serverInventory.tier)
for (i <- 0 to verticalSlots) {
val slot = InventorySlots.server(serverInventory.tier)(getInventory.size)
addSlotToContainer(100, 7 + i * slotSize, slot.slot, slot.tier)
}
for (i <- 0 to 1 + serverInventory.tier) {
for (i <- 0 to verticalSlots) {
val slot = InventorySlots.server(serverInventory.tier)(getInventory.size)
addSlotToContainer(124, 7 + i * slotSize, slot.slot, slot.tier)
}
for (i <- 0 to 1 + serverInventory.tier) {
for (i <- 0 to verticalSlots) {
val slot = InventorySlots.server(serverInventory.tier)(getInventory.size)
addSlotToContainer(148, 7 + i * slotSize, slot.slot, slot.tier)
}
for (i <- 1 to serverInventory.tier) {
for (i <- 2 to verticalSlots) {
val slot = InventorySlots.server(serverInventory.tier)(getInventory.size)
addSlotToContainer(76, 7 + (i + 1) * slotSize, slot.slot, slot.tier)
addSlotToContainer(76, 7 + i * slotSize, slot.slot, slot.tier)
}
// Show the player's inventory.

6
src/main/scala/li/cil/oc/common/inventory/ServerInventory.scala
View File

@ -8,11 +8,7 @@ import net.minecraft.item.ItemStack
trait ServerInventory extends ItemStackInventory {
def tier: Int
override def getSizeInventory = tier match {
case 1 => 12
case 2 => 16
case _ => 8
}
override def getSizeInventory = InventorySlots.server(tier).length
override protected def inventoryName = "Server"

3
src/main/scala/li/cil/oc/common/item/Server.scala
View File

@ -3,6 +3,7 @@ package li.cil.oc.common.item
import java.util
import li.cil.oc.common.GuiType
import li.cil.oc.common.InventorySlots.Tier
import li.cil.oc.common.inventory.ServerInventory
import li.cil.oc.util.{Rarity, Tooltip}
import li.cil.oc.{OpenComputers, Settings}
@ -26,7 +27,7 @@ class Server(val parent: Delegator, val tier: Int) extends Delegate {
}
override def tooltipLines(stack: ItemStack, player: EntityPlayer, tooltip: util.List[String], advanced: Boolean) {
tooltip.addAll(Tooltip.get(super.unlocalizedName, Settings.get.terminalsPerTier(tier)))
tooltip.addAll(Tooltip.get(super.unlocalizedName, Settings.get.terminalsPerTier(math.min(Tier.Three, tier))))
HelperInventory.container = stack
HelperInventory.reinitialize()
val items = mutable.Map.empty[String, Int]

3
src/main/scala/li/cil/oc/common/item/Terminal.scala
View File

@ -4,6 +4,7 @@ import java.util
import java.util.UUID
import cpw.mods.fml.relauncher.{Side, SideOnly}
import li.cil.oc.common.InventorySlots.Tier
import li.cil.oc.common.{GuiType, tileentity}
import li.cil.oc.server.{PacketSender => ServerPacketSender}
import li.cil.oc.{OpenComputers, Settings}
@ -60,7 +61,7 @@ class Terminal(val parent: Delegator) extends Delegate {
else {
keys -= stack.getTagCompound.getString(Settings.namespace + "key")
}
val maxSize = Settings.get.terminalsPerTier(server.tier)
val maxSize = Settings.get.terminalsPerTier(math.min(Tier.Three, server.tier))
while (keys.length >= maxSize) {
keys.remove(0)
}

3
src/main/scala/li/cil/oc/common/tileentity/Case.scala
View File

@ -5,6 +5,7 @@ import li.cil.oc.api.driver.Slot
import li.cil.oc.api.network.Connector
import li.cil.oc.api.{Driver, driver}
import li.cil.oc.common.InventorySlots
import li.cil.oc.common.InventorySlots.Tier
import li.cil.oc.util.Color
import li.cil.oc.{Settings, common}
import net.minecraft.entity.player.EntityPlayer
@ -55,7 +56,7 @@ class Case(var tier: Int) extends traits.PowerAcceptor with traits.Computer with
override def canUpdate = isServer
override def updateEntity() {
if (isServer && tier == 3 && world.getTotalWorldTime % Settings.get.tickFrequency == 0) {
if (isServer && tier == Tier.Four && world.getTotalWorldTime % Settings.get.tickFrequency == 0) {
// Creative case, make it generate power.
node.asInstanceOf[Connector].changeBuffer(Double.PositiveInfinity)
}

12
src/main/scala/li/cil/oc/common/tileentity/ServerRack.scala
View File

@ -9,6 +9,7 @@ import li.cil.oc._
import li.cil.oc.api.Network
import li.cil.oc.api.network._
import li.cil.oc.client.Sound
import li.cil.oc.common.InventorySlots.Tier
import li.cil.oc.server.{component, driver, PacketSender => ServerPacketSender}
import li.cil.oc.util.ExtendedNBT._
import li.cil.oc.util.mods.{Mods, Waila}
@ -179,7 +180,10 @@ class ServerRack extends traits.PowerAcceptor with traits.Hub with traits.PowerB
override def isItemValidForSlot(i: Int, stack: ItemStack) = {
val descriptor = api.Items.get(stack)
descriptor == api.Items.get("server1") || descriptor == api.Items.get("server2") || descriptor == api.Items.get("server3")
descriptor == api.Items.get("server1") ||
descriptor == api.Items.get("server2") ||
descriptor == api.Items.get("server3") ||
descriptor == api.Items.get("serverCreative")
}
// ----------------------------------------------------------------------- //
@ -230,7 +234,11 @@ class ServerRack extends traits.PowerAcceptor with traits.Hub with traits.PowerB
}
servers collect {
case Some(server) => server.machine.update()
case Some(server) =>
if (server.tier == Tier.Four && world.getTotalWorldTime % Settings.get.tickFrequency == 0) {
server.node.asInstanceOf[Connector].changeBuffer(Double.PositiveInfinity)
}
server.machine.update()
}
if (hasChanged) {