From f3697ea35f6da41ff7ea4aca78c3d64216079dae Mon Sep 17 00:00:00 2001 From: bdew Date: Mon, 24 Mar 2014 12:17:31 +0200 Subject: [PATCH] Added RS control to the apiary, fixed sync after world load --- resources/assets/gendustry/lang/en_US.lang | 1 + .../assets/gendustry/textures/gui/widgets.png | Bin 4424 -> 5655 bytes .../assets/gendustry/textures/gui/widgets.psd | Bin 77084 -> 88150 bytes src/net/bdew/gendustry/gui/Textures.scala | 22 ++++++++- .../rscontrol/ContainerRSControllable.scala | 31 +++++++++++++ .../gui/rscontrol/DataslotRSMode.scala | 19 ++++++++ .../bdew/gendustry/gui/rscontrol/RSMode.scala | 26 +++++++++++ .../gui/rscontrol/TileRSContollable.scala | 23 ++++++++++ .../gui/rscontrol/WidgetRSModeButton.scala | 42 ++++++++++++++++++ .../machines/apiary/ContainerApiary.scala | 3 +- .../gendustry/machines/apiary/GuiApiary.scala | 6 ++- .../machines/apiary/MachineApiary.scala | 2 +- .../machines/apiary/TileApiary.scala | 8 +++- .../machines/apiary/WidgetError.scala | 15 ++++--- 14 files changed, 184 insertions(+), 14 deletions(-) create mode 100644 src/net/bdew/gendustry/gui/rscontrol/ContainerRSControllable.scala create mode 100644 src/net/bdew/gendustry/gui/rscontrol/DataslotRSMode.scala create mode 100644 src/net/bdew/gendustry/gui/rscontrol/RSMode.scala create mode 100644 src/net/bdew/gendustry/gui/rscontrol/TileRSContollable.scala create mode 100644 src/net/bdew/gendustry/gui/rscontrol/WidgetRSModeButton.scala diff --git a/resources/assets/gendustry/lang/en_US.lang b/resources/assets/gendustry/lang/en_US.lang index e4bef82..90a81da 100644 --- a/resources/assets/gendustry/lang/en_US.lang +++ b/resources/assets/gendustry/lang/en_US.lang @@ -110,6 +110,7 @@ gendustry.label.mod.temperature=* Temperature gendustry.label.mod.humidity=* Humidity gendustry.error.power=Not enough power +gendustry.error.disabled=Disabled by settings gendustry.label.sample.rootBees=Taken from a Bee gendustry.label.sample.rootTrees=Taken from a Sapling diff --git a/resources/assets/gendustry/textures/gui/widgets.png b/resources/assets/gendustry/textures/gui/widgets.png index f6316aa11099f37a9e59dc835665d731f56f6792..84f0624b395c472668537756c5753203152d899a 100644 GIT binary patch literal 5655 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 diff --git a/resources/assets/gendustry/textures/gui/widgets.psd b/resources/assets/gendustry/textures/gui/widgets.psd index 3f0197ad8873b4714a6285d18371223aeab9ed71..ff0b58c4da4b44acc159ad36583573e8ba2f801f 100644 GIT binary patch delta 15499 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�>)Q;j&4 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 N@;~ssw`!`@e*@21Xp#T` delta 5194 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 z Texture(texture, 65, 35, 14, 14), + RSMode.NEVER -> Texture(texture, 81, 35, 14, 14), + RSMode.RS_ON -> Texture(texture, 49, 35, 14, 14), + RSMode.RS_OFF -> Texture(texture, 33, 35, 14, 14) + ) + } + } diff --git a/src/net/bdew/gendustry/gui/rscontrol/ContainerRSControllable.scala b/src/net/bdew/gendustry/gui/rscontrol/ContainerRSControllable.scala new file mode 100644 index 0000000..54437ce --- /dev/null +++ b/src/net/bdew/gendustry/gui/rscontrol/ContainerRSControllable.scala @@ -0,0 +1,31 @@ +/* + * Copyright (c) bdew, 2013 - 2014 + * https://github.com/bdew/gendustry + * + * This mod is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * https://raw.github.com/bdew/gendustry/master/MMPL-1.0.txt + */ + +package net.bdew.gendustry.gui.rscontrol + +import net.minecraft.entity.player.EntityPlayer +import net.bdew.lib.data.base.ContainerDataSlots + +trait ContainerRSControllable extends ContainerDataSlots { + val dataSource: TileRSContollable + + /** + * This implementation is piggybacking on vanilla Packet102WindowClick + * This is the fake slot number, and shouldn't be used by anything else + */ + final val RSMODE_SLOT_NUM = 1000 + + override def slotClick(slotnum: Int, button: Int, modifiers: Int, player: EntityPlayer) = + if (slotnum == RSMODE_SLOT_NUM) { + dataSource.rsmode := RSMode(button) + null + } else { + super.slotClick(slotnum, button, modifiers, player) + } +} diff --git a/src/net/bdew/gendustry/gui/rscontrol/DataslotRSMode.scala b/src/net/bdew/gendustry/gui/rscontrol/DataslotRSMode.scala new file mode 100644 index 0000000..d492b30 --- /dev/null +++ b/src/net/bdew/gendustry/gui/rscontrol/DataslotRSMode.scala @@ -0,0 +1,19 @@ +/* + * Copyright (c) bdew, 2013 - 2014 + * https://github.com/bdew/gendustry + * + * This mod is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * https://raw.github.com/bdew/gendustry/master/MMPL-1.0.txt + */ + +package net.bdew.gendustry.gui.rscontrol + +import net.bdew.lib.data.base.{UpdateKind, DataSlotVal, TileDataSlots} +import net.minecraft.nbt.NBTTagCompound + +case class DataslotRSMode(name: String, parent: TileDataSlots) extends DataSlotVal[RSMode.Value] { + var cval: RSMode.Value = RSMode.ALWAYS + def save(t: NBTTagCompound, kind: UpdateKind.Value) = t.setByte(name, cval.id.toByte) + def load(t: NBTTagCompound, kind: UpdateKind.Value) = cval = RSMode(t.getByte(name)) +} diff --git a/src/net/bdew/gendustry/gui/rscontrol/RSMode.scala b/src/net/bdew/gendustry/gui/rscontrol/RSMode.scala new file mode 100644 index 0000000..a3417b4 --- /dev/null +++ b/src/net/bdew/gendustry/gui/rscontrol/RSMode.scala @@ -0,0 +1,26 @@ +/* + * Copyright (c) bdew, 2013 - 2014 + * https://github.com/bdew/gendustry + * + * This mod is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * https://raw.github.com/bdew/gendustry/master/MMPL-1.0.txt + */ + +package net.bdew.gendustry.gui.rscontrol + +object RSMode extends Enumeration { + val ALWAYS = Value(0, "ALWAYS") + val RS_ON = Value(1, "RS_ON") + val RS_OFF = Value(2, "RS_OFF") + val NEVER = Value(3, "NEVER") + + final val RSMODE_SLOT_NUM = 1000 + + val next = Map( + RSMode.ALWAYS -> RSMode.RS_ON, + RSMode.RS_ON -> RSMode.RS_OFF, + RSMode.RS_OFF -> RSMode.NEVER, + RSMode.NEVER -> RSMode.ALWAYS + ) +} diff --git a/src/net/bdew/gendustry/gui/rscontrol/TileRSContollable.scala b/src/net/bdew/gendustry/gui/rscontrol/TileRSContollable.scala new file mode 100644 index 0000000..2a3803a --- /dev/null +++ b/src/net/bdew/gendustry/gui/rscontrol/TileRSContollable.scala @@ -0,0 +1,23 @@ +/* + * Copyright (c) bdew, 2013 - 2014 + * https://github.com/bdew/gendustry + * + * This mod is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * https://raw.github.com/bdew/gendustry/master/MMPL-1.0.txt + */ + +package net.bdew.gendustry.gui.rscontrol + +import net.bdew.lib.data.base.{UpdateKind, TileDataSlots} + +trait TileRSContollable extends TileDataSlots { + val rsmode = DataslotRSMode("rsmode", this).setUpdate(UpdateKind.SAVE, UpdateKind.GUI, UpdateKind.WORLD) + + def canWork = { + val powered = worldObj.isBlockIndirectlyGettingPowered(xCoord, yCoord, zCoord) + (rsmode :== RSMode.ALWAYS) || + ((rsmode :== RSMode.RS_ON) && powered) || + ((rsmode :== RSMode.RS_OFF) && !powered) + } +} diff --git a/src/net/bdew/gendustry/gui/rscontrol/WidgetRSModeButton.scala b/src/net/bdew/gendustry/gui/rscontrol/WidgetRSModeButton.scala new file mode 100644 index 0000000..86710b6 --- /dev/null +++ b/src/net/bdew/gendustry/gui/rscontrol/WidgetRSModeButton.scala @@ -0,0 +1,42 @@ +/* + * Copyright (c) bdew, 2013 - 2014 + * https://github.com/bdew/gendustry + * + * This mod is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * https://raw.github.com/bdew/gendustry/master/MMPL-1.0.txt + */ + +package net.bdew.gendustry.gui.rscontrol + +import net.bdew.lib.gui.{Texture, Rect, Point} +import net.bdew.lib.gui.widgets.Widget +import net.bdew.gendustry.gui.Textures +import scala.collection.mutable +import net.bdew.lib.{Misc, Client} + +class WidgetRSModeButton(p: Point, te: TileRSContollable, container: ContainerRSControllable) extends Widget { + val rect = new Rect(p, 16, 16) + val iconRect = new Rect(p +(1, 1), 14, 14) + + var icon: Texture = null + var hover: String = null + + override def draw(mouse: Point) { + if (rect.contains(mouse)) + parent.drawTexture(rect, Textures.button16.hover) + else + parent.drawTexture(rect, Textures.button16.base) + + parent.drawTexture(iconRect, Textures.button16.iconRSMode(te.rsmode)) + } + + override def handleTooltip(p: Point, tip: mutable.MutableList[String]) { + tip += Misc.toLocal("gendustry.rsmode." + te.rsmode.cval.toString.toLowerCase) + } + + override def mouseClicked(p: Point, button: Int) { + Client.minecraft.sndManager.playSoundFX("random.click", 1.0F, 1.0F) + Client.minecraft.playerController.windowClick(container.windowId, container.RSMODE_SLOT_NUM, RSMode.next(te.rsmode).id, 0, Client.player) + } +} diff --git a/src/net/bdew/gendustry/machines/apiary/ContainerApiary.scala b/src/net/bdew/gendustry/machines/apiary/ContainerApiary.scala index 68cdea8..9e6b746 100644 --- a/src/net/bdew/gendustry/machines/apiary/ContainerApiary.scala +++ b/src/net/bdew/gendustry/machines/apiary/ContainerApiary.scala @@ -16,8 +16,9 @@ import net.minecraft.inventory.{IInventory, Slot} import net.bdew.lib.items.ItemUtils import net.bdew.lib.data.base.ContainerDataSlots import net.bdew.lib.Misc +import net.bdew.gendustry.gui.rscontrol.ContainerRSControllable -class ContainerApiary(val te: TileApiary, player: EntityPlayer) extends BaseContainer(te) with ContainerDataSlots { +class ContainerApiary(val te: TileApiary, player: EntityPlayer) extends BaseContainer(te) with ContainerDataSlots with ContainerRSControllable { lazy val dataSource = te addSlotToContainer(new SlotValidating(te, 0, 39, 29)) diff --git a/src/net/bdew/gendustry/machines/apiary/GuiApiary.scala b/src/net/bdew/gendustry/machines/apiary/GuiApiary.scala index 7af5011..a1e2b96 100644 --- a/src/net/bdew/gendustry/machines/apiary/GuiApiary.scala +++ b/src/net/bdew/gendustry/machines/apiary/GuiApiary.scala @@ -11,12 +11,13 @@ package net.bdew.gendustry.machines.apiary import net.bdew.gendustry.Gendustry import net.minecraft.entity.player.EntityPlayer -import net.bdew.lib.gui.{Texture, Color, Rect, BaseScreen} +import net.bdew.lib.gui.{Texture, Color, Rect, BaseScreen, Point} import net.bdew.lib.gui.widgets.WidgetLabel import net.bdew.gendustry.gui.{HintIcons, WidgetPowerCustom, Textures} import net.bdew.lib.Misc +import net.bdew.gendustry.gui.rscontrol.WidgetRSModeButton -class GuiApiary(val te: TileApiary, player: EntityPlayer) extends BaseScreen(new ContainerApiary(te, player), 176, 166) { +class GuiApiary(val te: TileApiary, player: EntityPlayer, cont: ContainerApiary) extends BaseScreen(cont, 176, 166) { val background = Texture(Gendustry.modId, "textures/gui/apiary.png", rect) override def initGui() { super.initGui() @@ -24,6 +25,7 @@ class GuiApiary(val te: TileApiary, player: EntityPlayer) extends BaseScreen(new widgets.add(new WidgetPowerCustom(new Rect(8, 19, 16, 58), Textures.powerFill, te.power)) widgets.add(new WidgetApiaryProgress(new Rect(69, 22, 36, 15), te.guiBreeding, te.guiProgress)) widgets.add(new WidgetLabel(Misc.toLocal("tile.gendustry.apiary.name"), 8, 6, Color.darkgray)) + widgets.add(new WidgetRSModeButton(Point(137, 5), te, cont)) te.slots.upgrades.foreach(inventorySlots.getSlot(_).setBackgroundIcon(HintIcons.upgrade)) inventorySlots.getSlotFromInventory(te, te.slots.drone).setBackgroundIcon(HintIcons.drone) diff --git a/src/net/bdew/gendustry/machines/apiary/MachineApiary.scala b/src/net/bdew/gendustry/machines/apiary/MachineApiary.scala index b9f11b6..2ad1f8d 100644 --- a/src/net/bdew/gendustry/machines/apiary/MachineApiary.scala +++ b/src/net/bdew/gendustry/machines/apiary/MachineApiary.scala @@ -21,6 +21,6 @@ class MachineApiary extends Machine("IndustrialApiary", new BlockApiary(_)) with lazy val baseMjPerTick = tuning.getInt("BaseMjPerTick") @SideOnly(Side.CLIENT) - def getGui(te: TileApiary, player: EntityPlayer) = new GuiApiary(te, player) + def getGui(te: TileApiary, player: EntityPlayer) = new GuiApiary(te, player, new ContainerApiary(te, player)) def getContainer(te: TileApiary, player: EntityPlayer) = new ContainerApiary(te, player) } diff --git a/src/net/bdew/gendustry/machines/apiary/TileApiary.scala b/src/net/bdew/gendustry/machines/apiary/TileApiary.scala index 7d8f369..d1e1ef5 100644 --- a/src/net/bdew/gendustry/machines/apiary/TileApiary.scala +++ b/src/net/bdew/gendustry/machines/apiary/TileApiary.scala @@ -32,6 +32,7 @@ import net.bdew.lib.data.DataSlotBoolean import net.bdew.gendustry.power.TilePowered import net.bdew.lib.power.DataSlotPower import net.bdew.gendustry.compat.triggers.ForestryErrorSource +import net.bdew.gendustry.gui.rscontrol.TileRSContollable class TileApiary extends TileExtended with TileDataSlots @@ -40,6 +41,7 @@ with SidedInventory with BreakableInventoryTile with TilePowered with ForestryErrorSource +with TileRSContollable with IBeeHousing { object slots { @@ -71,7 +73,7 @@ with IBeeHousing { persistLoad.listen(x => { updateModifiers() - queen := getStackInSlot(slots.drone) + queen := getStackInSlot(slots.queen) }) def updateModifiers() { @@ -108,7 +110,9 @@ with IBeeHousing { serverTick.listen(() => { movePrincess = false - if (power.stored >= cfg.baseMjPerTick * mods.energy) { + if (!canWork) { + setErrorState(-2) + } else if (power.stored >= cfg.baseMjPerTick * mods.energy) { logic.update() if ((logic.getQueen != null || logic.getBreedingTime > 0) && (errorState :== 1)) power.extract(cfg.baseMjPerTick * mods.energy, false) diff --git a/src/net/bdew/gendustry/machines/apiary/WidgetError.scala b/src/net/bdew/gendustry/machines/apiary/WidgetError.scala index 5204d3a..576d297 100644 --- a/src/net/bdew/gendustry/machines/apiary/WidgetError.scala +++ b/src/net/bdew/gendustry/machines/apiary/WidgetError.scala @@ -21,19 +21,22 @@ class WidgetError(x: Int, y: Int, apiary: TileApiary) extends Widget { override def draw(mouse: Point) { val err = apiary.errorState.cval if (err == -1) { - parent.drawTexture(rect, Textures.texturePowerError) + parent.drawTexture(rect, Textures.errors.noPower) + } else if (err == -2) { + parent.drawTexture(rect, Textures.errors.disabled) + } else if (ErrorCodes.isValid(err)) { + parent.drawTexture(rect, ErrorCodes.getIcon(err)) } else { - if (ErrorCodes.isValid(err)) { - parent.drawTexture(rect, ErrorCodes.getIcon(err)) - } else { - parent.drawTexture(rect, ErrorCodes.getIcon(0)) - } + parent.drawTexture(rect, ErrorCodes.getIcon(0)) } } + override def handleTooltip(p: Point, tip: mutable.MutableList[String]) { val err = apiary.errorState.cval if (err == -1) { tip += Misc.toLocal(Gendustry.modId + ".error.power") + } else if (err == -2) { + tip += Misc.toLocal(Gendustry.modId + ".error.disabled") } else if (ErrorCodes.isValid(err)) { tip += ErrorCodes.getDescription(err) } else {