diff --git a/build.gradle b/build.gradle index 0cfc9eb..c2c7e4d 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,7 @@ buildscript { apply plugin: 'scala' apply plugin: 'forge' -version = "1.3.0" +version = "1.4.0" if (project.hasProperty('buildnum')) { project.version = project.version + '.' + project.buildnum @@ -31,10 +31,10 @@ if (project.hasProperty('buildnum')) { group = "net.bdew" archivesBaseName = "bdlib" -ext.versuffix = "mc172" +ext.versuffix = "mc1710" minecraft { - version = "1.7.2-10.12.2.1126" + version = "1.7.10-10.13.0.1177" replace("BDLIB_VER", project.version) } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d5c591c..b761216 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2b64450..678d9d8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Nov 28 11:30:59 IST 2013 +#Wed Jul 02 15:54:47 CDT 2014 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip diff --git a/src/net/bdew/lib/CommandDumpRegistry.scala b/src/net/bdew/lib/CommandDumpRegistry.scala index 76fee91..b58fdb4 100644 --- a/src/net/bdew/lib/CommandDumpRegistry.scala +++ b/src/net/bdew/lib/CommandDumpRegistry.scala @@ -52,10 +52,10 @@ class CommandDumpRegistry extends CommandBase { dumpWriter.write(FluidRegistry.getRegisteredFluids.map(_._1).toList.sorted.mkString("\n")) dumpWriter.write("\n\n") - CommandBase.notifyAdmins(sender, "Registry dumped to " + dumpFile.getCanonicalPath) + CommandBase.func_152373_a(sender, this, "Registry dumped to " + dumpFile.getCanonicalPath) } catch { case e: Throwable => - CommandBase.notifyAdmins(sender, "Failed to save registry dump: " + e) + CommandBase.func_152373_a(sender, this, "Failed to save registry dump: " + e) BdLib.logErrorException("Failed to save registry dump", e) } finally { dumpWriter.close() diff --git a/src/net/bdew/lib/Event.scala b/src/net/bdew/lib/Event.scala index f59b3cc..f85c88d 100644 --- a/src/net/bdew/lib/Event.scala +++ b/src/net/bdew/lib/Event.scala @@ -28,7 +28,7 @@ class Event2[T, R] extends EventBase[(T, R) => Unit] { } object Event { - def apply(t: Unit) = new Event0 + def apply() = new Event0 def apply[T] = new Event1[T] def apply[T, R] = new Event2[T, R] } \ No newline at end of file diff --git a/src/net/bdew/lib/gui/Texture.scala b/src/net/bdew/lib/gui/Texture.scala index e224a91..75737ab 100644 --- a/src/net/bdew/lib/gui/Texture.scala +++ b/src/net/bdew/lib/gui/Texture.scala @@ -47,7 +47,8 @@ class Sprite(val resource: ResourceLocation, r: Rect, scale: Int = 256) extends } class ScaledResourceLocation(path: String, val scale: Int = 256) extends ResourceLocation(path) { - def this(domain: String, path: String, scale: Int = 256) = this(domain + ":" + path, scale) + def this(domain: String, path: String, scale: Int) = this(domain + ":" + path, scale) + def this(domain: String, path: String) = this(domain + ":" + path, 256) } object Texture { diff --git a/src/net/bdew/lib/gui/widgets/WidgetFluidGauge.scala b/src/net/bdew/lib/gui/widgets/WidgetFluidGauge.scala index bb6433f..4650261 100644 --- a/src/net/bdew/lib/gui/widgets/WidgetFluidGauge.scala +++ b/src/net/bdew/lib/gui/widgets/WidgetFluidGauge.scala @@ -21,7 +21,7 @@ class WidgetFluidGauge(val rect: Rect, overlay: Texture, dslot: DataSlotTankBase override def handleTooltip(p: Point, tip: mutable.MutableList[String]) { if (dslot.getFluid != null) { - tip += dslot.getFluid.getFluid.getLocalizedName + tip += dslot.getFluid.getFluid.getLocalizedName(dslot.getFluid) tip += "%s/%s mB".format(formater.format(dslot.getFluidAmount), formater.format(dslot.getCapacity)) } else { tip += Misc.toLocal("bdlib.label.empty")