Force US locale on all upper/lower case conversions + normalized icon registration across all mods (#124)

This commit is contained in:
bdew committed 2015-08-09 15:59:47 +03:00
1 parent d2cd66e0c5
commit 98ea3db702
41 files changed
+149 -323

No files matched your search

+1 -1
View File
@@ -2,7 +2,7 @@ gendustry.version=1.6.0
gendustry.api.version=2.1.0
curseforge.id=70492
bdlib.version=1.9.2.100
bdlib.version=1.9.2.102
minecraft.version=1.7.10
forge.version=10.13.4.1448-1.7.10
+2 -2
View File
@@ -1,8 +1,8 @@
# ==== BLOCKS ====
tile.gendustry.mutagen.producer.name=Mutagen-Erzeuger
tile.gendustry.mutagen_producer.name=Mutagen-Erzeuger
tile.gendustry.mutatron.name=Mutatron
tile.gendustry.mutatron.adv.name=Erweitertes Mutatron
tile.gendustry.mutatron_adv.name=Erweitertes Mutatron
tile.gendustry.apiary.name=Industrieller Bienenstock
tile.gendustry.imprinter.name=Gen-Drucker
tile.gendustry.sampler.name=Gen-Abtaster
+2 -2
View File
@@ -1,8 +1,8 @@
# ==== BLOCKS ====
tile.gendustry.mutagen.producer.name=Mutagen Producer
tile.gendustry.mutagen_producer.name=Mutagen Producer
tile.gendustry.mutatron.name=Mutatron
tile.gendustry.mutatron.adv.name=Advanced Mutatron
tile.gendustry.mutatron_adv.name=Advanced Mutatron
tile.gendustry.apiary.name=Industrial Apiary
tile.gendustry.imprinter.name=Genetic Imprinter
tile.gendustry.sampler.name=Genetic Sampler
+2 -2
View File
@@ -1,8 +1,8 @@
# ==== BLOCKS ====
tile.gendustry.mutagen.producer.name=Producteur mutagène
tile.gendustry.mutagen_producer.name=Producteur mutagène
tile.gendustry.mutatron.name=Mutatron
tile.gendustry.mutatron.adv.name=Mutatron avancé
tile.gendustry.mutatron_adv.name=Mutatron avancé
tile.gendustry.apiary.name=Rucher industriel
tile.gendustry.imprinter.name=Imprimeur génétique
tile.gendustry.sampler.name=Échantillonneur génétique
+2 -2
View File
@@ -1,8 +1,8 @@
# ==== BLOCKS ====
tile.gendustry.mutagen.producer.name=Producteur de mutagène
tile.gendustry.mutagen_producer.name=Producteur de mutagène
tile.gendustry.mutatron.name=Mutatron
tile.gendustry.mutatron.adv.name=Mutatron avancé
tile.gendustry.mutatron_adv.name=Mutatron avancé
tile.gendustry.apiary.name=Rucher Industriel
tile.gendustry.imprinter.name=Implanteur génétique
tile.gendustry.sampler.name=Échantillonneur génétique
+2 -2
View File
@@ -1,9 +1,9 @@
# author Team MMKP(puyo061 , whffktkw ,clayweb)
# ==== BLOCKS ====
tile.gendustry.mutagen.producer.name=뮤타젠 생성기
tile.gendustry.mutagen_producer.name=뮤타젠 생성기
tile.gendustry.mutatron.name=뮤타트론
tile.gendustry.mutatron.adv.name=고급 뮤타트론
tile.gendustry.mutatron_adv.name=고급 뮤타트론
tile.gendustry.apiary.name=산업 양봉기
tile.gendustry.imprinter.name=유전자 각인기
tile.gendustry.sampler.name=유전자 샘플 추출기
+2 -2
View File
@@ -1,8 +1,8 @@
# ==== BLOCKS ====
tile.gendustry.mutagen.producer.name=Мутагенный производитель
tile.gendustry.mutagen_producer.name=Мутагенный производитель
tile.gendustry.mutatron.name=Мутатрон
tile.gendustry.mutatron.adv.name=Продвинутый мутатрон
tile.gendustry.mutatron_adv.name=Продвинутый мутатрон
tile.gendustry.apiary.name=Промышленная пасека
tile.gendustry.imprinter.name=Генетический импринтер
tile.gendustry.sampler.name=Генетический пробоотборник
+2 -2
View File
@@ -2,9 +2,9 @@
# ==== BLOCKS ====
tile.gendustry.mutagen.producer.name=诱变剂制造机
tile.gendustry.mutagen_producer.name=诱变剂制造机
tile.gendustry.mutatron.name=诱变机
tile.gendustry.mutatron.adv.name=高级诱变机
tile.gendustry.mutatron_adv.name=高级诱变机
tile.gendustry.apiary.name=工业蜂箱
tile.gendustry.imprinter.name=基因压印机
tile.gendustry.sampler.name=基因采样机
+2 -2
View File
@@ -1,9 +1,9 @@
#zh_TW
tile.gendustry.mutagen.name=誘變劑
tile.gendustry.mutagen.producer.name=誘變劑制造機
tile.gendustry.mutagen_producer.name=誘變劑制造機
tile.gendustry.mutatron.name=突變方塊
tile.gendustry.mutatron.adv.name=高級突變方塊
tile.gendustry.mutatron_adv.name=高級突變方塊
tile.gendustry.apiary.name=工業蜂箱
tile.gendustry.imprinter.name=基因復制機
tile.gendustry.sampler.name=基因拓模機
File renamed without changes.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

@@ -10,6 +10,7 @@
package net.bdew.gendustry.compat.triggers
import buildcraft.api.statements.{IStatementContainer, IStatementParameter, ITriggerExternal}
import net.bdew.gendustry.Gendustry
import net.bdew.lib.Misc
import net.minecraft.client.renderer.texture.IIconRegister
import net.minecraft.tileentity.TileEntity
@@ -21,7 +22,7 @@ abstract class BaseTrigger[T <: TileEntity](val id: String, ordering: String, ti
override def getUniqueTag = "gendustry." + ordering + "." + id
override def getIcon = icon
override def registerIcons(ir: IIconRegister) =
icon = ir.registerIcon("gendustry:trigger/" + id)
icon = ir.registerIcon(Misc.iconName(Gendustry.modId, "trigger", id))
override def getDescription = Misc.toLocal("gendustry.trigger." + id)
override def rotateLeft() = this
+5 -3
View File
@@ -9,6 +9,8 @@
package net.bdew.gendustry.config
import java.util.Locale
import cpw.mods.fml.common.registry.GameRegistry
import net.bdew.gendustry.Gendustry
import net.bdew.gendustry.fluids.{BlockFluid, ItemFluidBucket, ItemFluidCan}
@@ -30,13 +32,13 @@ object Fluids extends FluidManager {
viscosity: Int = 1000,
isGaseous: Boolean = false): Fluid = {
val ownFluid = if (FluidRegistry.isFluidRegistered(id)) {
val ownFluid = if (FluidRegistry.isFluidRegistered(id.toLowerCase(Locale.US))) {
Gendustry.logDebug("Fluid %s already registered, using existing (%s)", id, FluidRegistry.getFluid(id))
false
} else {
Gendustry.logDebug("Registering fluid %s", id)
val newFluid = new Fluid(id)
newFluid.setUnlocalizedName((Misc.getActiveModId + "." + id).toLowerCase)
newFluid.setUnlocalizedName((Misc.getActiveModId + "." + id).toLowerCase(Locale.US))
newFluid.setLuminosity(luminosity)
newFluid.setDensity(density)
newFluid.setTemperature(temperature)
@@ -45,7 +47,7 @@ object Fluids extends FluidManager {
FluidRegistry.registerFluid(newFluid)
true
}
val fluid = FluidRegistry.getFluid(id.toLowerCase)
val fluid = FluidRegistry.getFluid(id.toLowerCase(Locale.US))
if (fluid.getBlock == null) {
val block = new BlockFluid(fluid, ownFluid)
GameRegistry.registerBlock(block, "fluid." + id)
@@ -12,6 +12,7 @@ package net.bdew.gendustry.custom
import cpw.mods.fml.relauncher.{Side, SideOnly}
import forestry.api.apiculture.EnumBeeType
import forestry.api.core.IIconProvider
import net.bdew.lib.Misc
import net.minecraft.client.renderer.texture.IIconRegister
import net.minecraft.util.IIcon
@@ -27,12 +28,14 @@ object BeeIconProvider extends IIconProvider {
icons = Array.fill(EnumBeeType.values().length, 3)(null)
EnumBeeType.values().filter(_ != EnumBeeType.NONE).foreach(beeType => {
icons(beeType.ordinal())(0) = register.registerIcon("forestry:bees/%s/%s.outline".format(iconType, beeType).toLowerCase)
icons(beeType.ordinal())(0) = register.registerIcon(Misc.iconName("forestry", "bees", iconType, beeType + ".outline"))
if (beeType == EnumBeeType.LARVAE)
icons(beeType.ordinal())(1) = register.registerIcon("forestry:bees/%s/%s.body".format(iconType, beeType).toLowerCase)
icons(beeType.ordinal())(1) = register.registerIcon(Misc.iconName("forestry", "bees", iconType, beeType + ".body"))
else
icons(beeType.ordinal())(1) = register.registerIcon("forestry:bees/%s/body1".format(iconType).toLowerCase)
icons(beeType.ordinal())(2) = register.registerIcon("forestry:bees/%s/%s.body2".format(iconType, beeType).toLowerCase)
icons(beeType.ordinal())(1) = register.registerIcon(Misc.iconName("forestry", "bees", iconType, "body1"))
icons(beeType.ordinal())(2) = register.registerIcon(Misc.iconName("forestry", "bees", iconType, beeType + ".body2"))
})
}
@@ -9,6 +9,8 @@
package net.bdew.gendustry.custom
import java.util.Locale
import forestry.api.apiculture.IAlleleBeeSpecies
import forestry.api.apiculture.hives.HiveManager
import forestry.api.core.{EnumHumidity, EnumTemperature}
@@ -60,7 +62,7 @@ object CustomHives {
def registerHives(): Unit = {
val validBiomes = BiomeGenBase.getBiomeGenArray.filterNot(null == _).map(x => x.biomeName.toLowerCase -> x).toMap
val validBiomes = BiomeGenBase.getBiomeGenArray.filterNot(null == _).map(x => x.biomeName.toLowerCase(Locale.US) -> x).toMap
for (definition <- definitions) {
Gendustry.logDebug("Processing Beehive definition: %s", definition)
@@ -74,26 +76,26 @@ object CustomHives {
val range = getSingleStatement(definition, classOf[HDYRange]) getOrElse HDYRange(0, 255)
val biomeNames = (Misc.filterType(definition.definition, classOf[HDBiomes]) flatMap (_.biomes) map (_.toLowerCase)).toSet
val biomeNames = (Misc.filterType(definition.definition, classOf[HDBiomes]) flatMap (_.biomes) map (_.toLowerCase(Locale.US))).toSet
val biomes =
if (biomeNames.isEmpty || biomeNames.contains("all"))
validBiomes.values.toSet
else
validBiomes.filterKeys(biomeNames.contains).values.toSet
val temperatureNames = (Misc.filterType(definition.definition, classOf[HDTemperature]) flatMap (_.temperatures) map (_.toLowerCase)).toSet
val temperatureNames = (Misc.filterType(definition.definition, classOf[HDTemperature]) flatMap (_.temperatures) map (_.toLowerCase(Locale.US))).toSet
val temperatures =
if (temperatureNames.isEmpty || temperatureNames.contains("all"))
EnumTemperature.values().toSet
else
EnumTemperature.values().filter(x => temperatureNames.contains(x.getName.toLowerCase)).toSet
EnumTemperature.values().filter(x => temperatureNames.contains(x.getName.toLowerCase(Locale.US))).toSet
val humidityNames = (Misc.filterType(definition.definition, classOf[HDHumidity]) flatMap (_.humidityLevels) map (_.toLowerCase)).toSet
val humidityNames = (Misc.filterType(definition.definition, classOf[HDHumidity]) flatMap (_.humidityLevels) map (_.toLowerCase(Locale.US))).toSet
val humidities =
if (humidityNames.isEmpty || humidityNames.contains("all"))
EnumHumidity.values().toSet
else
EnumHumidity.values().filter(x => humidityNames.contains(x.getName.toLowerCase)).toSet
EnumHumidity.values().filter(x => humidityNames.contains(x.getName.toLowerCase(Locale.US))).toSet
var conditions = (for (condition <- Misc.filterType(definition.definition, classOf[HiveDefCondition])) yield {
@@ -150,9 +152,14 @@ object CustomHives {
hives += definition.id -> hive
val sideTexture = getSingleStatement(definition, classOf[HDSideTexture]) map (_.loc) getOrElse "%s:beehives/%s/side".format(Gendustry.modId, definition.id).toLowerCase
val topTexture = getSingleStatement(definition, classOf[HDTopTexture]) map (_.loc) getOrElse "%s:beehives/%s/top".format(Gendustry.modId, definition.id).toLowerCase
val sideTexture = getSingleStatement(definition, classOf[HDSideTexture]) map (_.loc) getOrElse
Misc.iconName(Gendustry.modId, "beehives", definition.id, "side")
val topTexture = getSingleStatement(definition, classOf[HDTopTexture]) map (_.loc) getOrElse
Misc.iconName(Gendustry.modId, "beehives", definition.id, "top")
val bottomTexture = getSingleStatement(definition, classOf[HDTopTexture]) map (_.loc) getOrElse topTexture
val lightLevel = getSingleStatement(definition, classOf[HDLight]) map (_.level) getOrElse 0
val color = getSingleStatement(definition, classOf[HDColor]) map (_.color) getOrElse 0xFFFFFF
@@ -11,6 +11,7 @@ package net.bdew.gendustry.fluids
import cpw.mods.fml.relauncher.{Side, SideOnly}
import net.bdew.gendustry.Gendustry
import net.bdew.lib.Misc
import net.minecraft.block.material.Material
import net.minecraft.client.renderer.texture.IIconRegister
import net.minecraft.util.IIcon
@@ -37,8 +38,8 @@ class BlockFluid(val fluid: Fluid, val ownIcons: Boolean) extends BlockFluidClas
@SideOnly(Side.CLIENT)
override def registerBlockIcons(register: IIconRegister) {
if (ownIcons) {
fluid.setStillIcon(register.registerIcon(Gendustry.modId + ":fluids/" + fluid.getName + "/still"))
fluid.setFlowingIcon(register.registerIcon(Gendustry.modId + ":fluids/" + fluid.getName + "/flowing"))
fluid.setStillIcon(register.registerIcon(Misc.iconName(Gendustry.modId, "fluids", fluid.getName, "still")))
fluid.setFlowingIcon(register.registerIcon(Misc.iconName(Gendustry.modId, "fluids", fluid.getName, "flowing")))
}
}
}
@@ -9,11 +9,14 @@
package net.bdew.gendustry.fluids
import java.util.Locale
import cpw.mods.fml.common.eventhandler.Event.Result
import cpw.mods.fml.common.eventhandler.SubscribeEvent
import cpw.mods.fml.common.registry.GameRegistry
import cpw.mods.fml.relauncher.{Side, SideOnly}
import net.bdew.gendustry.Gendustry
import net.bdew.lib.Misc
import net.minecraft.client.renderer.texture.IIconRegister
import net.minecraft.item.{ItemBucket, ItemStack}
import net.minecraftforge.common.MinecraftForge
@@ -21,7 +24,7 @@ import net.minecraftforge.event.entity.player.FillBucketEvent
import net.minecraftforge.fluids.Fluid
class ItemFluidBucket(fluid: Fluid) extends ItemBucket(fluid.getBlock) {
setUnlocalizedName(Gendustry.modId + "." + fluid.getName.toLowerCase + ".bucket")
setUnlocalizedName(Gendustry.modId + "." + fluid.getName.toLowerCase(Locale.US) + ".bucket")
setContainerItem(GameRegistry.findItem("minecraft", "bucket"))
@@ -38,6 +41,6 @@ class ItemFluidBucket(fluid: Fluid) extends ItemBucket(fluid.getBlock) {
@SideOnly(Side.CLIENT)
override def registerIcons(reg: IIconRegister) {
itemIcon = reg.registerIcon(Gendustry.modId + ":bucket/" + fluid.getName.toLowerCase)
itemIcon = reg.registerIcon(Misc.iconName(Gendustry.modId, "bucket", fluid.getName))
}
}
@@ -9,17 +9,20 @@
package net.bdew.gendustry.fluids
import java.util.Locale
import cpw.mods.fml.relauncher.{Side, SideOnly}
import net.bdew.gendustry.Gendustry
import net.bdew.lib.Misc
import net.minecraft.client.renderer.texture.IIconRegister
import net.minecraft.item.Item
import net.minecraftforge.fluids.Fluid
class ItemFluidCan(fluid: Fluid) extends Item {
setUnlocalizedName(Gendustry.modId + "." + fluid.getName.toLowerCase + ".can")
setUnlocalizedName(Gendustry.modId + "." + fluid.getName.toLowerCase(Locale.US) + ".can")
@SideOnly(Side.CLIENT)
override def registerIcons(reg: IIconRegister) {
itemIcon = reg.registerIcon(Gendustry.modId + ":can/" + fluid.getName.toLowerCase)
itemIcon = reg.registerIcon(Misc.iconName(Gendustry.modId, "can", fluid.getName))
}
}
@@ -9,6 +9,8 @@
package net.bdew.gendustry.gui.rscontrol
import java.util.Locale
import net.bdew.gendustry.gui.Textures
import net.bdew.lib.gui.widgets.Widget
import net.bdew.lib.gui.{Point, Rect, Texture}
@@ -35,7 +37,7 @@ class WidgetRSModeButton(p: Point, te: TileRSControllable, container: ContainerR
}
override def handleTooltip(p: Point, tip: mutable.MutableList[String]) {
tip += Misc.toLocal("gendustry.rsmode." + te.rsmode.value.toString.toLowerCase)
tip += Misc.toLocal("gendustry.rsmode." + te.rsmode.value.toString.toLowerCase(Locale.US))
}
override def mouseClicked(p: Point, button: Int) {
@@ -12,6 +12,7 @@ package net.bdew.gendustry.items
import cpw.mods.fml.relauncher.{Side, SideOnly}
import net.bdew.gendustry.Gendustry
import net.bdew.gendustry.compat.itempush.ItemPush
import net.bdew.lib.Misc
import net.bdew.lib.covers.{ItemCover, TileCoverable}
import net.bdew.lib.items.SimpleItem
import net.minecraft.client.renderer.texture.IIconRegister
@@ -44,6 +45,6 @@ object EjectCover extends SimpleItem("EjectCover") with ItemCover {
@SideOnly(Side.CLIENT)
override def registerIcons(reg: IIconRegister) {
itemIcon = reg.registerIcon(Gendustry.modId + ":covers/eject")
itemIcon = reg.registerIcon(Misc.iconName(Gendustry.modId, "covers", "eject"))
}
}
@@ -42,6 +42,6 @@ object ImportCover extends SimpleItem("ImportCover") with ItemCover {
@SideOnly(Side.CLIENT)
override def registerIcons(reg: IIconRegister) {
itemIcon = reg.registerIcon(Gendustry.modId + ":covers/import")
itemIcon = reg.registerIcon(Misc.iconName(Gendustry.modId, "covers", "import"))
}
}
@@ -97,6 +97,6 @@ object IndustrialGrafter extends ItemTool(0, Item.ToolMaterial.IRON, new util.Ha
@SideOnly(Side.CLIENT)
override def registerIcons(reg: IIconRegister) {
itemIcon = reg.registerIcon(Gendustry.modId + ":grafter")
itemIcon = reg.registerIcon(Misc.iconName(Gendustry.modId, "grafter"))
}
}
@@ -89,6 +89,6 @@ object IndustrialScoop extends ItemTool(0, Item.ToolMaterial.IRON, new util.Hash
@SideOnly(Side.CLIENT)
override def registerIcons(reg: IIconRegister) {
itemIcon = reg.registerIcon(Gendustry.modId + ":scoop")
itemIcon = reg.registerIcon(Misc.iconName(Gendustry.modId, "scoop"))
}
}
@@ -0,0 +1,46 @@
/*
* Copyright (c) bdew, 2013 - 2015
* 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
* http://bdew.net/minecraft-mod-public-license/
*/
package net.bdew.gendustry.machines
import cpw.mods.fml.relauncher.{Side, SideOnly}
import net.bdew.gendustry.Gendustry
import net.bdew.lib.Misc
import net.minecraft.block.Block
import net.minecraft.block.material.{MapColor, Material}
import net.minecraft.client.renderer.texture.IIconRegister
import net.minecraft.util.IIcon
object MachineMaterial extends Material(MapColor.ironColor)
class BaseMachineBlock(name: String) extends Block(MachineMaterial) {
setBlockName(Gendustry.modId + "." + name)
setHardness(2)
var topIcon: IIcon = null
var bottomIcon: IIcon = null
override def getIcon(side: Int, meta: Int): IIcon = {
side match {
case 0 =>
return bottomIcon
case 1 =>
return topIcon
case _ =>
return blockIcon
}
}
@SideOnly(Side.CLIENT)
override def registerBlockIcons(reg: IIconRegister) {
bottomIcon = reg.registerIcon(Misc.iconName(Gendustry.modId, name, "bottom"))
topIcon = reg.registerIcon(Misc.iconName(Gendustry.modId, name, "top"))
blockIcon = reg.registerIcon(Misc.iconName(Gendustry.modId, name, "side"))
}
}
@@ -9,38 +9,18 @@
package net.bdew.gendustry.machines.advmutatron
import cpw.mods.fml.relauncher.{Side, SideOnly}
import net.bdew.gendustry.Gendustry
import net.bdew.gendustry.gui.BlockGuiWrenchable
import net.bdew.gendustry.machines.BaseMachineBlock
import net.bdew.gendustry.misc.BlockTooltipHelper
import net.bdew.lib.block.{BlockKeepData, BlockTooltip, HasTE}
import net.bdew.lib.covers.BlockCoverable
import net.minecraft.block.Block
import net.minecraft.block.material.Material
import net.minecraft.client.renderer.texture.IIconRegister
import net.minecraft.entity.player.EntityPlayer
import net.minecraft.item.ItemStack
import net.minecraft.util.IIcon
object BlockMutatronAdv extends Block(Material.rock) with HasTE[TileMutatronAdv] with BlockCoverable[TileMutatronAdv] with BlockGuiWrenchable with BlockTooltip with BlockKeepData {
object BlockMutatronAdv extends BaseMachineBlock("mutatron_adv") with HasTE[TileMutatronAdv] with BlockCoverable[TileMutatronAdv] with BlockGuiWrenchable with BlockTooltip with BlockKeepData {
val TEClass = classOf[TileMutatronAdv]
private var icons: Array[IIcon] = null
lazy val guiId = MachineMutatronAdv.guiId
setBlockName(Gendustry.modId + ".mutatron.adv")
setHardness(5)
override def getIcon(side: Int, meta: Int): IIcon = {
side match {
case 0 =>
return icons(0)
case 1 =>
return icons(1)
case _ =>
return icons(2)
}
}
override def getTooltip(stack: ItemStack, player: EntityPlayer, advanced: Boolean): List[String] = {
if (stack.hasTagCompound && stack.getTagCompound.hasKey("data")) {
val data = stack.getTagCompound.getCompoundTag("data")
@@ -51,12 +31,4 @@ object BlockMutatronAdv extends Block(Material.rock) with HasTE[TileMutatronAdv]
} else List.empty
}
@SideOnly(Side.CLIENT)
override def registerBlockIcons(reg: IIconRegister) {
icons = new Array[IIcon](3)
icons(0) = reg.registerIcon(Gendustry.modId + ":mutatron_adv/bottom")
icons(1) = reg.registerIcon(Gendustry.modId + ":mutatron_adv/top")
icons(2) = reg.registerIcon(Gendustry.modId + ":mutatron_adv/side")
}
}
@@ -12,32 +12,33 @@ package net.bdew.gendustry.machines.apiary
import cpw.mods.fml.relauncher.{Side, SideOnly}
import net.bdew.gendustry.Gendustry
import net.bdew.gendustry.gui.BlockGuiWrenchable
import net.bdew.gendustry.machines.MachineMaterial
import net.bdew.gendustry.misc.BlockTooltipHelper
import net.bdew.lib.Misc
import net.bdew.lib.block.{BlockKeepData, BlockTooltip, HasTE}
import net.bdew.lib.covers.BlockCoverable
import net.minecraft.block.Block
import net.minecraft.block.material.Material
import net.minecraft.client.renderer.texture.IIconRegister
import net.minecraft.entity.player.{EntityPlayer, EntityPlayerMP}
import net.minecraft.item.ItemStack
import net.minecraft.util.IIcon
import net.minecraft.world.{IBlockAccess, World}
object BlockApiary extends Block(Material.rock) with HasTE[TileApiary] with BlockCoverable[TileApiary] with BlockGuiWrenchable with BlockTooltip with BlockKeepData {
object BlockApiary extends Block(MachineMaterial) with HasTE[TileApiary] with BlockCoverable[TileApiary] with BlockGuiWrenchable with BlockTooltip with BlockKeepData {
private var icons: Array[IIcon] = null
val TEClass = classOf[TileApiary]
lazy val guiId: Int = MachineApiary.guiId
setBlockName(Gendustry.modId + ".apiary")
setHardness(5)
setHardness(2)
override def getIcon(side: Int, meta: Int): IIcon = if (side < 2) icons(0) else icons(1)
@SideOnly(Side.CLIENT)
override def registerBlockIcons(reg: IIconRegister) {
icons = new Array[IIcon](2)
icons(0) = reg.registerIcon(Gendustry.modId + ":apiary/top")
icons(1) = reg.registerIcon(Gendustry.modId + ":apiary/side")
icons(0) = reg.registerIcon(Misc.iconName(Gendustry.modId, "apiary", "top"))
icons(1) = reg.registerIcon(Misc.iconName(Gendustry.modId, "apiary", "side"))
}
override def getLightValue(world: IBlockAccess, x: Int, y: Int, z: Int): Int = {
@@ -11,6 +11,8 @@ package net.bdew.gendustry.machines.apiary
import cpw.mods.fml.relauncher.{Side, SideOnly}
import forestry.api.core.{ErrorStateRegistry, IErrorState}
import net.bdew.gendustry.Gendustry
import net.bdew.lib.Misc
import net.minecraft.client.renderer.texture.IIconRegister
import net.minecraft.util.IIcon
@@ -26,7 +28,7 @@ case class GendustryErrorState(name: String, id: Short) extends IErrorState {
@SideOnly(Side.CLIENT)
override def registerIcons(register: IIconRegister) {
icon = register.registerIcon("gendustry:error/" + name)
icon = register.registerIcon(Misc.iconName(Gendustry.modId, "error", name))
}
}
@@ -121,7 +121,7 @@ object ItemApiaryUpgrade extends Item with IApiaryUpgrade with NamedItem {
@SideOnly(Side.CLIENT)
override def registerIcons(reg: IIconRegister) {
icons = Upgrades.map.map({
case (id, upgrade) => id -> reg.registerIcon("%s:upgrades/%s".format(Gendustry.modId, upgrade.name))
case (id, upgrade) => id -> reg.registerIcon(Misc.iconName(Gendustry.modId, "upgrades", upgrade.name))
}).toMap
}
}
@@ -9,6 +9,8 @@
package net.bdew.gendustry.machines.apiary.upgrades
import java.util.Locale
import cpw.mods.fml.common.registry.GameRegistry
import net.bdew.gendustry.api.ApiaryModifiers
import net.bdew.gendustry.config.Tuning
@@ -49,7 +51,7 @@ object Upgrades {
}
}
def str2bool(s: String) = Tuning.trueVals.contains(s.toLowerCase)
def str2bool(s: String) = Tuning.trueVals.contains(s.toLowerCase(Locale.US))
def makeStrMod(upg: String, n: String, v: String): ModFunc = n match {
case "sealed" => (a, n) => a.isSealed = str2bool(v)
@@ -9,38 +9,18 @@
package net.bdew.gendustry.machines.extractor
import cpw.mods.fml.relauncher.{Side, SideOnly}
import net.bdew.gendustry.Gendustry
import net.bdew.gendustry.gui.BlockGuiWrenchable
import net.bdew.gendustry.machines.BaseMachineBlock
import net.bdew.gendustry.misc.BlockTooltipHelper
import net.bdew.lib.block.{BlockKeepData, BlockTooltip, HasTE}
import net.bdew.lib.covers.BlockCoverable
import net.minecraft.block.Block
import net.minecraft.block.material.Material
import net.minecraft.client.renderer.texture.IIconRegister
import net.minecraft.entity.player.EntityPlayer
import net.minecraft.item.ItemStack
import net.minecraft.util.IIcon
object BlockExtractor extends Block(Material.rock) with HasTE[TileExtractor] with BlockCoverable[TileExtractor] with BlockGuiWrenchable with BlockTooltip with BlockKeepData {
private var icons: Array[IIcon] = null
object BlockExtractor extends BaseMachineBlock("extractor") with HasTE[TileExtractor] with BlockCoverable[TileExtractor] with BlockGuiWrenchable with BlockTooltip with BlockKeepData {
val TEClass = classOf[TileExtractor]
lazy val guiId = MachineExtractor.guiId
setBlockName(Gendustry.modId + ".extractor")
setHardness(5)
override def getIcon(side: Int, meta: Int): IIcon = {
side match {
case 0 =>
return icons(0)
case 1 =>
return icons(1)
case _ =>
return icons(2)
}
}
override def getTooltip(stack: ItemStack, player: EntityPlayer, advanced: Boolean): List[String] = {
if (stack.hasTagCompound && stack.getTagCompound.hasKey("data")) {
val data = stack.getTagCompound.getCompoundTag("data")
@@ -50,12 +30,4 @@ object BlockExtractor extends Block(Material.rock) with HasTE[TileExtractor] wit
BlockTooltipHelper.getItemsTooltip(data)
} else List.empty
}
@SideOnly(Side.CLIENT)
override def registerBlockIcons(reg: IIconRegister) {
icons = new Array[IIcon](3)
icons(0) = reg.registerIcon(Gendustry.modId + ":extractor/bottom")
icons(1) = reg.registerIcon(Gendustry.modId + ":extractor/top")
icons(2) = reg.registerIcon(Gendustry.modId + ":extractor/side")
}
}
@@ -9,38 +9,18 @@
package net.bdew.gendustry.machines.imprinter
import cpw.mods.fml.relauncher.{Side, SideOnly}
import net.bdew.gendustry.Gendustry
import net.bdew.gendustry.gui.BlockGuiWrenchable
import net.bdew.gendustry.machines.BaseMachineBlock
import net.bdew.gendustry.misc.BlockTooltipHelper
import net.bdew.lib.block.{BlockKeepData, BlockTooltip, HasTE}
import net.bdew.lib.covers.BlockCoverable
import net.minecraft.block.Block
import net.minecraft.block.material.Material
import net.minecraft.client.renderer.texture.IIconRegister
import net.minecraft.entity.player.EntityPlayer
import net.minecraft.item.ItemStack
import net.minecraft.util.IIcon
object BlockImprinter extends Block(Material.rock) with HasTE[TileImprinter] with BlockCoverable[TileImprinter] with BlockGuiWrenchable with BlockTooltip with BlockKeepData {
object BlockImprinter extends BaseMachineBlock("imprinter") with HasTE[TileImprinter] with BlockCoverable[TileImprinter] with BlockGuiWrenchable with BlockTooltip with BlockKeepData {
val TEClass = classOf[TileImprinter]
private var icons: Array[IIcon] = null
lazy val guiId: Int = MachineImprinter.guiId
setBlockName(Gendustry.modId + ".imprinter")
setHardness(5)
override def getIcon(side: Int, meta: Int): IIcon = {
side match {
case 0 =>
return icons(0)
case 1 =>
return icons(1)
case _ =>
return icons(2)
}
}
override def getTooltip(stack: ItemStack, player: EntityPlayer, advanced: Boolean): List[String] = {
if (stack.hasTagCompound && stack.getTagCompound.hasKey("data")) {
val data = stack.getTagCompound.getCompoundTag("data")
@@ -50,11 +30,4 @@ object BlockImprinter extends Block(Material.rock) with HasTE[TileImprinter] wit
} else List.empty
}
@SideOnly(Side.CLIENT)
override def registerBlockIcons(reg: IIconRegister) {
icons = new Array[IIcon](3)
icons(0) = reg.registerIcon(Gendustry.modId + ":imprinter/bottom")
icons(1) = reg.registerIcon(Gendustry.modId + ":imprinter/top")
icons(2) = reg.registerIcon(Gendustry.modId + ":imprinter/side")
}
}
@@ -9,38 +9,18 @@
package net.bdew.gendustry.machines.liquifier
import cpw.mods.fml.relauncher.{Side, SideOnly}
import net.bdew.gendustry.Gendustry
import net.bdew.gendustry.gui.BlockGuiWrenchable
import net.bdew.gendustry.machines.BaseMachineBlock
import net.bdew.gendustry.misc.BlockTooltipHelper
import net.bdew.lib.block.{BlockKeepData, BlockTooltip, HasTE}
import net.bdew.lib.covers.BlockCoverable
import net.minecraft.block.Block
import net.minecraft.block.material.Material
import net.minecraft.client.renderer.texture.IIconRegister
import net.minecraft.entity.player.EntityPlayer
import net.minecraft.item.ItemStack
import net.minecraft.util.IIcon
object BlockLiquifier extends Block(Material.rock) with HasTE[TileLiquifier] with BlockCoverable[TileLiquifier] with BlockGuiWrenchable with BlockTooltip with BlockKeepData {
private var icons: Array[IIcon] = null
object BlockLiquifier extends BaseMachineBlock("liquifier") with HasTE[TileLiquifier] with BlockCoverable[TileLiquifier] with BlockGuiWrenchable with BlockTooltip with BlockKeepData {
val TEClass = classOf[TileLiquifier]
lazy val guiId = MachineLiquifier.guiId
setBlockName(Gendustry.modId + ".liquifier")
setHardness(5)
override def getIcon(side: Int, meta: Int): IIcon = {
side match {
case 0 =>
return icons(0)
case 1 =>
return icons(1)
case _ =>
return icons(2)
}
}
override def getTooltip(stack: ItemStack, player: EntityPlayer, advanced: Boolean): List[String] = {
if (stack.hasTagCompound && stack.getTagCompound.hasKey("data")) {
val data = stack.getTagCompound.getCompoundTag("data")
@@ -50,12 +30,4 @@ object BlockLiquifier extends Block(Material.rock) with HasTE[TileLiquifier] wit
BlockTooltipHelper.getItemsTooltip(data)
} else List.empty
}
@SideOnly(Side.CLIENT)
override def registerBlockIcons(reg: IIconRegister) {
icons = new Array[IIcon](3)
icons(0) = reg.registerIcon(Gendustry.modId + ":liquifier/bottom")
icons(1) = reg.registerIcon(Gendustry.modId + ":liquifier/top")
icons(2) = reg.registerIcon(Gendustry.modId + ":liquifier/side")
}
}
@@ -9,38 +9,18 @@
package net.bdew.gendustry.machines.mproducer
import cpw.mods.fml.relauncher.{Side, SideOnly}
import net.bdew.gendustry.Gendustry
import net.bdew.gendustry.gui.BlockGuiWrenchable
import net.bdew.gendustry.machines.BaseMachineBlock
import net.bdew.gendustry.misc.BlockTooltipHelper
import net.bdew.lib.block.{BlockKeepData, BlockTooltip, HasTE}
import net.bdew.lib.covers.BlockCoverable
import net.minecraft.block.Block
import net.minecraft.block.material.Material
import net.minecraft.client.renderer.texture.IIconRegister
import net.minecraft.entity.player.EntityPlayer
import net.minecraft.item.ItemStack
import net.minecraft.util.IIcon
object BlockMutagenProducer extends Block(Material.rock) with HasTE[TileMutagenProducer] with BlockCoverable[TileMutagenProducer] with BlockGuiWrenchable with BlockTooltip with BlockKeepData {
private var icons: Array[IIcon] = null
object BlockMutagenProducer extends BaseMachineBlock("mutagen_producer") with HasTE[TileMutagenProducer] with BlockCoverable[TileMutagenProducer] with BlockGuiWrenchable with BlockTooltip with BlockKeepData {
val TEClass = classOf[TileMutagenProducer]
lazy val guiId = MachineMutagenProducer.guiId
setBlockName(Gendustry.modId + ".mutagen.producer")
setHardness(5)
override def getIcon(side: Int, meta: Int): IIcon = {
side match {
case 0 =>
return icons(0)
case 1 =>
return icons(1)
case _ =>
return icons(2)
}
}
override def getTooltip(stack: ItemStack, player: EntityPlayer, advanced: Boolean): List[String] = {
if (stack.hasTagCompound && stack.getTagCompound.hasKey("data")) {
val data = stack.getTagCompound.getCompoundTag("data")
@@ -50,12 +30,4 @@ object BlockMutagenProducer extends Block(Material.rock) with HasTE[TileMutagenP
BlockTooltipHelper.getItemsTooltip(data)
} else List.empty
}
@SideOnly(Side.CLIENT)
override def registerBlockIcons(reg: IIconRegister) {
icons = new Array(3)
icons(0) = reg.registerIcon(Gendustry.modId + ":mutagenproducer/bottom")
icons(1) = reg.registerIcon(Gendustry.modId + ":mutagenproducer/top")
icons(2) = reg.registerIcon(Gendustry.modId + ":mutagenproducer/side")
}
}
@@ -9,38 +9,18 @@
package net.bdew.gendustry.machines.mutatron
import cpw.mods.fml.relauncher.{Side, SideOnly}
import net.bdew.gendustry.Gendustry
import net.bdew.gendustry.gui.BlockGuiWrenchable
import net.bdew.gendustry.machines.BaseMachineBlock
import net.bdew.gendustry.misc.BlockTooltipHelper
import net.bdew.lib.block.{BlockKeepData, BlockTooltip, HasTE}
import net.bdew.lib.covers.BlockCoverable
import net.minecraft.block.Block
import net.minecraft.block.material.Material
import net.minecraft.client.renderer.texture.IIconRegister
import net.minecraft.entity.player.EntityPlayer
import net.minecraft.item.ItemStack
import net.minecraft.util.IIcon
object BlockMutatron extends Block(Material.rock) with HasTE[TileMutatron] with BlockCoverable[TileMutatron] with BlockGuiWrenchable with BlockTooltip with BlockKeepData {
object BlockMutatron extends BaseMachineBlock("mutatron") with HasTE[TileMutatron] with BlockCoverable[TileMutatron] with BlockGuiWrenchable with BlockTooltip with BlockKeepData {
val TEClass = classOf[TileMutatron]
private var icons: Array[IIcon] = null
lazy val guiId: Int = MachineMutatron.guiId
setBlockName(Gendustry.modId + ".mutatron")
setHardness(5)
override def getIcon(side: Int, meta: Int): IIcon = {
side match {
case 0 =>
return icons(0)
case 1 =>
return icons(1)
case _ =>
return icons(2)
}
}
override def getTooltip(stack: ItemStack, player: EntityPlayer, advanced: Boolean): List[String] = {
if (stack.hasTagCompound && stack.getTagCompound.hasKey("data")) {
val data = stack.getTagCompound.getCompoundTag("data")
@@ -51,12 +31,4 @@ object BlockMutatron extends Block(Material.rock) with HasTE[TileMutatron] with
} else List.empty
}
@SideOnly(Side.CLIENT)
override def registerBlockIcons(reg: IIconRegister) {
icons = new Array(3)
icons(0) = reg.registerIcon(Gendustry.modId + ":mutatron/bottom")
icons(1) = reg.registerIcon(Gendustry.modId + ":mutatron/top")
icons(2) = reg.registerIcon(Gendustry.modId + ":mutatron/side")
}
}
@@ -9,38 +9,18 @@
package net.bdew.gendustry.machines.replicator
import cpw.mods.fml.relauncher.{Side, SideOnly}
import net.bdew.gendustry.Gendustry
import net.bdew.gendustry.gui.BlockGuiWrenchable
import net.bdew.gendustry.machines.BaseMachineBlock
import net.bdew.gendustry.misc.BlockTooltipHelper
import net.bdew.lib.block.{BlockKeepData, BlockTooltip, HasTE}
import net.bdew.lib.covers.BlockCoverable
import net.minecraft.block.Block
import net.minecraft.block.material.Material
import net.minecraft.client.renderer.texture.IIconRegister
import net.minecraft.entity.player.EntityPlayer
import net.minecraft.item.ItemStack
import net.minecraft.util.IIcon
object BlockReplicator extends Block(Material.rock) with HasTE[TileReplicator] with BlockCoverable[TileReplicator] with BlockGuiWrenchable with BlockTooltip with BlockKeepData {
object BlockReplicator extends BaseMachineBlock("replicator") with HasTE[TileReplicator] with BlockCoverable[TileReplicator] with BlockGuiWrenchable with BlockTooltip with BlockKeepData {
val TEClass = classOf[TileReplicator]
private var icons: Array[IIcon] = null
lazy val guiId: Int = MachineReplicator.guiId
setBlockName(Gendustry.modId + ".replicator")
setHardness(5)
override def getIcon(side: Int, meta: Int): IIcon = {
side match {
case 0 =>
return icons(0)
case 1 =>
return icons(1)
case _ =>
return icons(2)
}
}
override def getTooltip(stack: ItemStack, player: EntityPlayer, advanced: Boolean): List[String] = {
if (stack.hasTagCompound && stack.getTagCompound.hasKey("data")) {
val data = stack.getTagCompound.getCompoundTag("data")
@@ -51,12 +31,4 @@ object BlockReplicator extends Block(Material.rock) with HasTE[TileReplicator] w
BlockTooltipHelper.getItemsTooltip(data)
} else List.empty
}
@SideOnly(Side.CLIENT)
override def registerBlockIcons(reg: IIconRegister) {
icons = new Array[IIcon](3)
icons(0) = reg.registerIcon(Gendustry.modId + ":replicator/bottom")
icons(1) = reg.registerIcon(Gendustry.modId + ":replicator/top")
icons(2) = reg.registerIcon(Gendustry.modId + ":replicator/side")
}
}
@@ -9,38 +9,18 @@
package net.bdew.gendustry.machines.sampler
import cpw.mods.fml.relauncher.{Side, SideOnly}
import net.bdew.gendustry.Gendustry
import net.bdew.gendustry.gui.BlockGuiWrenchable
import net.bdew.gendustry.machines.BaseMachineBlock
import net.bdew.gendustry.misc.BlockTooltipHelper
import net.bdew.lib.block.{BlockKeepData, BlockTooltip, HasTE}
import net.bdew.lib.covers.BlockCoverable
import net.minecraft.block.Block
import net.minecraft.block.material.Material
import net.minecraft.client.renderer.texture.IIconRegister
import net.minecraft.entity.player.EntityPlayer
import net.minecraft.item.ItemStack
import net.minecraft.util.IIcon
object BlockSampler extends Block(Material.rock) with HasTE[TileSampler] with BlockCoverable[TileSampler] with BlockGuiWrenchable with BlockTooltip with BlockKeepData {
object BlockSampler extends BaseMachineBlock("sampler") with HasTE[TileSampler] with BlockCoverable[TileSampler] with BlockGuiWrenchable with BlockTooltip with BlockKeepData {
val TEClass = classOf[TileSampler]
private var icons: Array[IIcon] = null
lazy val guiId: Int = MachineSampler.guiId
setBlockName(Gendustry.modId + ".sampler")
setHardness(5)
override def getIcon(side: Int, meta: Int): IIcon = {
side match {
case 0 =>
return icons(0)
case 1 =>
return icons(1)
case _ =>
return icons(2)
}
}
override def getTooltip(stack: ItemStack, player: EntityPlayer, advanced: Boolean): List[String] = {
if (stack.hasTagCompound && stack.getTagCompound.hasKey("data")) {
val data = stack.getTagCompound.getCompoundTag("data")
@@ -49,12 +29,4 @@ object BlockSampler extends Block(Material.rock) with HasTE[TileSampler] with Bl
BlockTooltipHelper.getItemsTooltip(data)
} else List.empty
}
@SideOnly(Side.CLIENT)
override def registerBlockIcons(reg: IIconRegister) {
icons = new Array[IIcon](3)
icons(0) = reg.registerIcon(Gendustry.modId + ":sampler/bottom")
icons(1) = reg.registerIcon(Gendustry.modId + ":sampler/top")
icons(2) = reg.registerIcon(Gendustry.modId + ":sampler/side")
}
}
@@ -9,38 +9,18 @@
package net.bdew.gendustry.machines.transposer
import cpw.mods.fml.relauncher.{Side, SideOnly}
import net.bdew.gendustry.Gendustry
import net.bdew.gendustry.gui.BlockGuiWrenchable
import net.bdew.gendustry.machines.BaseMachineBlock
import net.bdew.gendustry.misc.BlockTooltipHelper
import net.bdew.lib.block.{BlockKeepData, BlockTooltip, HasTE}
import net.bdew.lib.covers.BlockCoverable
import net.minecraft.block.Block
import net.minecraft.block.material.Material
import net.minecraft.client.renderer.texture.IIconRegister
import net.minecraft.entity.player.EntityPlayer
import net.minecraft.item.ItemStack
import net.minecraft.util.IIcon
object BlockTransposer extends Block(Material.rock) with HasTE[TileTransposer] with BlockCoverable[TileTransposer] with BlockGuiWrenchable with BlockTooltip with BlockKeepData {
object BlockTransposer extends BaseMachineBlock("transposer") with HasTE[TileTransposer] with BlockCoverable[TileTransposer] with BlockGuiWrenchable with BlockTooltip with BlockKeepData {
val TEClass = classOf[TileTransposer]
private var icons: Array[IIcon] = null
lazy val guiId: Int = MachineTransposer.guiId
setBlockName(Gendustry.modId + ".transposer")
setHardness(5)
override def getIcon(side: Int, meta: Int): IIcon = {
side match {
case 0 =>
return icons(0)
case 1 =>
return icons(1)
case _ =>
return icons(2)
}
}
override def getTooltip(stack: ItemStack, player: EntityPlayer, advanced: Boolean): List[String] = {
if (stack.hasTagCompound && stack.getTagCompound.hasKey("data")) {
val data = stack.getTagCompound.getCompoundTag("data")
@@ -49,12 +29,4 @@ object BlockTransposer extends Block(Material.rock) with HasTE[TileTransposer] w
BlockTooltipHelper.getItemsTooltip(data)
} else List.empty
}
@SideOnly(Side.CLIENT)
override def registerBlockIcons(reg: IIconRegister) {
icons = new Array[IIcon](3)
icons(0) = reg.registerIcon(Gendustry.modId + ":transposer/bottom")
icons(1) = reg.registerIcon(Gendustry.modId + ":transposer/top")
icons(2) = reg.registerIcon(Gendustry.modId + ":transposer/side")
}
}
@@ -10,6 +10,7 @@
package net.bdew.gendustry.misc
import java.util
import java.util.Locale
import _root_.forestry.api.genetics.{AlleleManager, IAllele, ISpeciesRoot}
import net.bdew.gendustry.forestry.{GeneSampleInfo, GeneticsHelper}
@@ -27,7 +28,7 @@ class CommandGiveSample extends CommandBase {
lazy val validAlleles = AlleleManager.alleleRegistry.getRegisteredAlleles.map(_._1).toList
def validChromosomes(root: ISpeciesRoot) =
(GeneticsHelper.getCleanKaryotype(root) map { case (n, c) => c.toString.toLowerCase -> c.ordinal() }).toSeq
(GeneticsHelper.getCleanKaryotype(root) map { case (n, c) => c.toString.toLowerCase(Locale.US) -> c.ordinal() }).toSeq
def isValidAllele(root: ISpeciesRoot, chromosome: Int, allele: IAllele) =
GeneticsHelper.getCleanKaryotype(root) get chromosome exists { chr =>
@@ -9,6 +9,8 @@
package net.bdew.gendustry.waila
import java.util.Locale
import mcp.mobius.waila.api.{IWailaConfigHandler, IWailaDataAccessor}
import net.bdew.gendustry.machines.apiary.TileApiary
import net.bdew.lib.Misc
@@ -20,7 +22,7 @@ object WailaApiaryDataProvider extends BaseDataProvider(classOf[TileApiary]) {
var strings = target.errorConditions.toList.sortBy(_.getID) map { err =>
EnumChatFormatting.RED + Misc.toLocal("for." + err.getDescription)
}
strings :+= Misc.toLocalF("gendustry.label.control", Misc.toLocal("gendustry.rsmode." + target.rsmode.value.toString.toLowerCase))
strings :+= Misc.toLocalF("gendustry.label.control", Misc.toLocal("gendustry.rsmode." + target.rsmode.value.toString.toLowerCase(Locale.US)))
if (target.queen :!= null)
strings :+= target.queen.getDisplayName