From 78a69acc447fc3ae087bd734040ec1a7f5fba871 Mon Sep 17 00:00:00 2001 From: bdew Date: Sat, 1 Feb 2014 12:26:29 +0200 Subject: [PATCH] Bumping version --- build.gradle | 2 +- src/net/bdew/lib/gui/WidgetContainer.scala | 2 +- src/net/bdew/lib/gui/widgets/WidgetDynLabel.scala | 3 +-- src/net/bdew/lib/gui/widgets/WidgetSubcontainer.scala | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 913fd7a..0a025ee 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ buildscript { apply plugin: 'forge' apply plugin: 'scala' -version = "1.1.0" +version = "1.2.0" if (project.hasProperty('buildnum')) { project.version = project.version + '.' + project.buildnum diff --git a/src/net/bdew/lib/gui/WidgetContainer.scala b/src/net/bdew/lib/gui/WidgetContainer.scala index a83f566..fa5f34c 100644 --- a/src/net/bdew/lib/gui/WidgetContainer.scala +++ b/src/net/bdew/lib/gui/WidgetContainer.scala @@ -85,7 +85,7 @@ class WidgetContainerWindow(val parent: BaseScreen, xSz: Int, ySz: Int) extends def getOffsetFromWindow = Point(0, 0) val rect = Rect(0, 0, xSz, ySz) - final val F = 1/256F + final val F = 1 / 256F def addVertexUVScaled(x: Float, y: Float, z: Float, u: Float, v: Float) { Tessellator.instance.addVertexWithUV(x, y, z, u * F, v * F) diff --git a/src/net/bdew/lib/gui/widgets/WidgetDynLabel.scala b/src/net/bdew/lib/gui/widgets/WidgetDynLabel.scala index 21099ea..3e2aa17 100644 --- a/src/net/bdew/lib/gui/widgets/WidgetDynLabel.scala +++ b/src/net/bdew/lib/gui/widgets/WidgetDynLabel.scala @@ -9,10 +9,9 @@ package net.bdew.lib.gui.widgets -import net.bdew.lib.gui.widgets.Widget import net.bdew.lib.gui.{Point, Rect} -class WidgetDynLabel(text: =>String, x: Int, y: Int, color: Int) extends Widget { +class WidgetDynLabel(text: => String, x: Int, y: Int, color: Int) extends Widget { val rect: Rect = new Rect(x, y, 0, 0) override def draw(mouse: Point) { parent.getFontRenderer.drawString(text, x, y, color) diff --git a/src/net/bdew/lib/gui/widgets/WidgetSubcontainer.scala b/src/net/bdew/lib/gui/widgets/WidgetSubcontainer.scala index e216831..54fc8ce 100644 --- a/src/net/bdew/lib/gui/widgets/WidgetSubcontainer.scala +++ b/src/net/bdew/lib/gui/widgets/WidgetSubcontainer.scala @@ -18,5 +18,5 @@ class WidgetSubcontainer(val rect: Rect) extends BaseWidget with WidgetContainer def getOffsetFromWindow = parent.getOffsetFromWindow + rect.origin def drawTexture(r: Rect, uv: Point, color: Color = Color.white) = parent.drawTexture(r, uv, color) def drawIcon(r: Rect, i: Icon, color: Color = Color.white) = parent.drawIcon(r, i, color) - def drawTextureScaled(r: Rect, t: TextureLocationScaled, color: Color = Color.white) = parent.drawTextureScaled(r, t,color) + def drawTextureScaled(r: Rect, t: TextureLocationScaled, color: Color = Color.white) = parent.drawTextureScaled(r, t, color) }