check for NEK and version bump.

Growth value and entity health are now config options there.

README.md

@@ -1,4 +0,0 @@
-Waila-1.7.10
-============
-
-A port of Prof. Mobius' Minecraft mod, Waila, to Minecraft 1.7.10. Unofficial.

assets/waila/lang/de_DE.lang

@@ -1,148 +1,137 @@
-screen.button.waila=Waila
-screen.button.modules=Module
-screen.label.scale=Maße
-screen.label.dragtuto=Verschiebe das HUD, um seine Position zu ändern.
-
-screen.button.default=Standard
-screen.button.cancel=Abbrechen
-screen.button.ok=Ok
-screen.button.yes=Ja
-screen.button.no=Nein
-screen.button.back=Zurück
-screen.button.hidden=Versteckt
-screen.button.visible=Sichtbar
-screen.button.maintained=Gewartet
-screen.button.toggled=Geschaltet
-
-choice.showhidewaila=Zeige/Verstecke Waila
-choice.showhideidmeta=Zeige ID:Metadata
-choice.toggledmaintained=Geschaltet/Gewartet
-choice.showliquids=Flüssigkeiten
-choice.shifttoggledblock=Blöcke schleichend umschalten
-choice.shifttoggledents=Lebewesen schleichend umschalten
-screen.button.configureaspect=Konfiguriere Aspekt...
-
-enchant.title.name=Name
-enchant.title.minlvl=Min lvl
-enchant.title.maxlvl=Max lvl
-enchant.title.weight=Gewicht
-enchant.label.enchantability=Verzauberbarkeit
-
-waila.keybind.wailaconfig=[Waila] Config-Bildschirm
-waila.keybind.wailadisplay=[Waila] Zeigen/Verstecken
-waila.keybind.liquid=[Waila] Zeige Flüssigkeiten
-waila.keybind.recipe=[Waila] Zeige Rezept
-waila.keybind.usage=[Waila] Zeige Nutzung
-waila.keybind.testing=[Waila] Testen
-
-client.msg.norecipe=Kein Rezept gefunden.
-client.msg.nousage=Keine Nutzung gefunden.
-
-hud.msg.none=<Nichts>
-hud.msg.empty=<Leer>
-hud.msg.output=Output
-hud.msg.input=Input
-hud.msg.out=Out
-hud.msg.in=In
-hud.msg.power=Energie
-hud.msg.storage=Speicher
-hud.msg.stored=Gespeichert
-hud.msg.any=Jegliches
-hud.msg.mode=Modus
-hud.msg.maxpower=Max Energie
-hud.msg.trigger=Trigger
-hud.msg.maxio=Max IO
-
-hud.msg.send=Senden
-hud.msg.recv=Empfangen
-hud.msg.item=Item
-hud.msg.fluid=Flüssigk.
-hud.msg.energ=Energie
-hud.msg.frequency=Frequenz
-
-hud.msg.owner=Besitzer
-hud.msg.public=Öffentlich
-hud.msg.restricted=Eingeschränkt
-hud.msg.private=Privat
-
-hud.msg.white=Weiß
-hud.msg.orange=Orange
-hud.msg.magenta=Magenta
-hud.msg.lblue=HBlau
-hud.msg.yellow=Gelb
-hud.msg.lime=HGrün
-hud.msg.pink=Pink
-hud.msg.gray=Grau
-hud.msg.lgray=HGrau
-hud.msg.cyan=Türkis
-hud.msg.purple=Violett
-hud.msg.blue=Blau
-hud.msg.brown=Braun
-hud.msg.green=Grün
-hud.msg.red=Rot
-hud.msg.black=Schwarz
-
-hud.msg.growth=Wachstum
-hud.msg.mature=Erwachsen
-hud.msg.off=Aus
-hud.msg.on=An
-hud.msg.state=Status
-hud.msg.delay=Verzögerung
-hud.msg.comparator=Komparator
-hud.msg.substractor=Substraktor
-hud.msg.record=Platte
-
-hud.msg.offers=Angebote
-hud.msg.demands=Bedarf
-
-option.appeng.monitorcontent=Monitorinhalt
-option.bb.content=Fassinhalt
-option.bc.tankamount=Flüssigk.-Menge
-option.bc.tanktype=Flüssigk.-Typ
-option.enderstorage.colors=Farben
-option.ic2.inputeumach=Max EU-Input [Maschinen]
-option.ic2.inputeuother=Max EU-Input [Anderes]
-option.ic2.inputeu=Max EU-Input
-option.ic2.outputeu=Max EU-Output
-option.ic2.storage=Energie gespeichert
-option.ic2.consump=Zeige Verbrauch
-option.ic2.tradeomat=Zeige Tauschautomaten-Forderung
-option.thaumcraft.storedvis=Kondensatorspeicher
-option.thermalexpansion.energyhandler=Zeige RO-Speicher
-option.thermalexpansion.energycell=Zeige EZellen IN/OUT
-option.thermalexpansion.fluidtype=Zeige Flüssigk.-Typ
-option.thermalexpansion.fluidamount=Zeige Flüssigk.-Menge
-option.thermalexpansion.tankmode=Zeige Tankmodus
-option.thermalexpansion.tesssendrecv=Tesseraktmodus
-option.thermalexpansion.tessfreq=Tesseraktfrequenz
-option.thermalexpansion.owner=Zeige Besitzer
-option.thermalexpansion.conditemmode=Zeige Itemduktmodus
-option.vanilla.spawntype=Spawner-Typ
-option.vanilla.growthvalue=Wachstumswert
-option.vanilla.leverstate=Hebelstatus
-option.vanilla.repeater=Repeater-Verzögerung
-option.vanilla.comparator=Komparatormodus
-option.vanilla.redstone=Redstone-Stärke
-option.vanilla.jukebox=Musikbox-Platte
-option.vanilla.silverfish=Silberfisch verdecken
-option.etb.displaydata=Zeige Sockeldaten
-option.enderio.inout=Zeige Input/Output
-option.enderio.storage=Zeige gespeicherte MJ
-option.enderio.owner=Zeige Block-Besitzer
-option.enderio.channel=Zeige Hypercube-Kanal
-option.bcapi.storage=Zeige gespeicherte MJ
-option.bcapi.consump=Zeige maximale Energie
-option.bcapi.trigger=Zeige Startenergie
-option.pr.showio=Zeige Gatter IO
-option.pr.showdata=Zeige Gatterdaten
-option.extrautilities.fluidamount=Zeige Flüssigk.-Menge
-option.openblocks.fluidamount=Zeige Flüssigk.-Menge
-option.railcraft.fluidamount=Zeige Flüssigk.-Menge
-option.secretrooms.hide=Getarnte Blöcke verdecken
-option.carpenters.hide=Getarnte Blöcke verdecken
-option.stevescarts.showall=Zeige Daten
-option.stevescarts.colorblind=Farbenblind-Modus
-option.stevescarts.shifttoggle=Schleichend Umschalten
-option.general.showhp=Zeige Gesundheit von Lebewesen
-option.general.showcrop=Zeige Pflanzenwachstum
-option.thaumcraft.aspects=Zeige Aspekte
+screen.button.waila=Waila
+screen.button.modules=Module
+screen.label.scale=Maße
+screen.label.dragtuto=Verschiebe das HUD, um seine Position zu ändern.
+
+screen.button.default=Standard
+screen.button.cancel=Abbrechen
+screen.button.ok=Ok
+screen.button.yes=Ja
+screen.button.no=Nein
+screen.button.back=Zurück
+screen.button.hidden=Versteckt
+screen.button.visible=Sichtbar
+screen.button.maintained=Gewartet
+screen.button.toggled=Geschaltet
+
+choice.showhidewaila=Zeige/Verstecke Waila
+choice.showhideidmeta=Zeige ID:Metadata
+choice.toggledmaintained=Geschaltet/Gewartet
+choice.showliquids=Flüssigkeiten
+screen.button.configureaspect=Konfiguriere Aspekt...
+
+enchant.title.name=Name
+enchant.title.minlvl=Min lvl
+enchant.title.maxlvl=Max lvl
+enchant.title.weight=Gewicht
+enchant.label.enchantability=Verzauberbarkeit
+
+waila.keybind.wailaconfig=[Waila] Config-Bildschirm
+waila.keybind.wailadisplay=[Waila] Zeigen/Verstecken
+waila.keybind.liquid=[Waila] Zeige Flüssigkeiten
+waila.keybind.recipe=[Waila] Zeige Rezept
+waila.keybind.usage=[Waila] Zeige Nutzung
+waila.keybind.testing=[Waila] Testen
+
+client.msg.norecipe=Kein Rezept gefunden.
+client.msg.nousage=Keine Nutzung gefunden.
+
+hud.msg.none=<Nichts>
+hud.msg.empty=<Leer>
+hud.msg.output=Output
+hud.msg.input=Input
+hud.msg.out=Out
+hud.msg.in=In
+hud.msg.power=Energie
+hud.msg.storage=Speicher
+hud.msg.stored=Gespeichert
+hud.msg.any=Jegliches
+hud.msg.mode=Modus
+hud.msg.maxpower=Max Energie
+hud.msg.trigger=Trigger
+hud.msg.maxio=Max IO
+
+hud.msg.send=Senden
+hud.msg.recv=Empfangen
+hud.msg.item=Item
+hud.msg.fluid=Flüssigk.
+hud.msg.energ=Energie
+hud.msg.frequency=Frequenz
+
+hud.msg.owner=Besitzer
+hud.msg.public=Öffentlich
+hud.msg.restricted=Eingeschränkt
+hud.msg.private=Privat
+
+hud.msg.white=Weiß
+hud.msg.orange=Orange
+hud.msg.magenta=Magenta
+hud.msg.lblue=HBlau
+hud.msg.yellow=Gelb
+hud.msg.lime=HGrün
+hud.msg.pink=Pink
+hud.msg.gray=Grau
+hud.msg.lgray=HGrau
+hud.msg.cyan=Türkis
+hud.msg.purple=Violett
+hud.msg.blue=Blau
+hud.msg.brown=Braun
+hud.msg.green=Grün
+hud.msg.red=Rot
+hud.msg.black=Schwarz
+
+hud.msg.growth=Wachstum
+hud.msg.mature=Erwachsen
+hud.msg.off=Aus
+hud.msg.on=An
+hud.msg.state=Status
+hud.msg.delay=Verzögerung
+hud.msg.comparator=Komparator
+hud.msg.substractor=Substraktor
+hud.msg.record=Platte
+
+hud.msg.offers=Angebote
+hud.msg.demands=Bedarf
+
+option.appeng.monitorcontent=Monitorinhalt
+option.bb.content=Fassinhalt
+option.bc.tankamount=Flüssigk.-Menge
+option.bc.tanktype=Flüssigk.-Typ
+option.enderstorage.colors=Farben
+option.ic2.inputeumach=Max EU-Input [Maschinen]
+option.ic2.inputeuother=Max EU-Input [Anderes]
+option.ic2.inputeu=Max EU-Input
+option.ic2.outputeu=Max EU-Output
+option.ic2.storage=Energie gespeichert
+option.ic2.consump=Zeige Verbrauch
+option.ic2.tradeomat=Zeige Tauschautomaten-Forderung
+option.thaumcraft.storedvis=Kondensatorspeicher
+option.thermalexpansion.energyhandler=Zeige RO-Speicher
+option.thermalexpansion.energycell=Zeige EZellen IN/OUT
+option.thermalexpansion.fluidtype=Zeige Flüssigk.-Typ
+option.thermalexpansion.fluidamount=Zeige Flüssigk.-Menge
+option.thermalexpansion.tankmode=Zeige Tankmodus
+option.thermalexpansion.tesssendrecv=Tesseraktmodus
+option.thermalexpansion.tessfreq=Tesseraktfrequenz
+option.thermalexpansion.owner=Zeige Besitzer
+option.thermalexpansion.conditemmode=Zeige Itemduktmodus
+option.vanilla.spawntype=Spawner-Typ
+option.vanilla.growthvalue=Wachstumswert
+option.vanilla.leverstate=Hebelstatus
+option.vanilla.repeater=Repeater-Verzögerung
+option.vanilla.comparator=Komparatormodus
+option.vanilla.redstone=Redstone-Stärke
+option.vanilla.jukebox=Musikbox-Platte
+option.etb.displaydata=Zeige Sockeldaten
+option.enderio.inout=Zeige Input/Output
+option.enderio.storage=Zeige gespeicherte MJ
+option.enderio.owner=Zeige Block-Besitzer
+option.enderio.channel=Zeige Hypercube-Kanal
+option.bcapi.storage=Zeige gespeicherte MJ
+option.bcapi.consump=Zeige maximale Energie
+option.bcapi.trigger=Zeige Startenergie
+option.pr.showio=Zeige Gatter IO
+option.pr.showdata=Zeige Gatterdaten
+option.extrautilities.fluidamount=Zeige Flüssigk.-Menge
+option.openblocks.fluidamount=Zeige Flüssigk.-Menge
+option.railcraft.fluidamount=Zeige Flüssigk.-Menge

assets/waila/lang/nl_NL.lang

@@ -1,117 +1,117 @@
-screen.button.waila=Waila
-screen.button.modules=Modules
-screen.label.scale=Schaal
-screen.label.dragtuto=Sleep de HUD om zijn positie in te stellen.
-
-screen.button.default=Standaard
-screen.button.cancel=Annuleren
-screen.button.ok=Ok
-screen.button.yes=Ja
-screen.button.no=Nee
-screen.button.back=Terug
-screen.button.hidden=Verborgen
-screen.button.visible=Zichtbaar
-screen.button.maintained=Gehandhaafd
-screen.button.toggled=Omgeschakeld
-
-choice.showhidewaila=Toon/Verberg Waila
-choice.showhideidmeta=Toon ID:Metadata
-choice.toggledmaintained=Omgeschakeld/Gehandhaafd
-choice.showliquids=Vloeistoffen
-screen.button.configureaspect=Configureer aspect...
-
-enchant.title.name=Naam
-enchant.title.minlvl=Min lvl
-enchant.title.maxlvl=Max lvl
-enchant.title.weight=Gewicht
-enchant.label.enchantability=Enchantbaarheid
-
-keybind.configscreen=[Waila] Configuratiescherm
-keybind.showhide=[Waila] Toon/Verberg
-keybind.showliquid=[Waila] Toon vloeistoffen
-keybind.showrecipe=[Waila] Toon recepten
-keybind.showusage=[Waila] Toon gebruik
-keybind.testing=[Waila] Testen
-
-client.msg.norecipe=Geen recept gevonden.
-client.msg.nousage=Geen gebruik gevonden.
-
-hud.msg.none=<Geen>
-hud.msg.empty=<Leeg>
-hud.msg.output=Uitvoer
-hud.msg.input=Invoer
-hud.msg.out=Uit
-hud.msg.in=In
-hud.msg.power=Vermogen
-hud.msg.storage=Opslag
-hud.msg.any=Om het even welke
-hud.msg.mode=Modus
-
-hud.msg.send=Zend
-hud.msg.recv=Ontv
-hud.msg.item=Item
-hud.msg.fluid=Vloeistof
-hud.msg.energ=Energie
-hud.msg.frequency=Frequentie
-
-hud.msg.owner=Eigenaar
-hud.msg.public=Publiek
-hud.msg.restricted=Begrensd
-hud.msg.private=Privé
-
-hud.msg.white=Wit
-hud.msg.orange=Oranje
-hud.msg.magenta=Magenta
-hud.msg.lblue=LBlauw
-hud.msg.yellow=Geel
-hud.msg.lime=Limoen
-hud.msg.pink=Roze
-hud.msg.gray=Grijs
-hud.msg.lgray=LGrijs
-hud.msg.cyan=Cyaan
-hud.msg.purple=Paars
-hud.msg.blue=Blauw
-hud.msg.brown=Bruin
-hud.msg.green=Groen
-hud.msg.red=Rood
-hud.msg.black=Zwart
-
-hud.msg.growth=Groei
-hud.msg.mature=Volwassen
-hud.msg.off=Af
-hud.msg.on=Aan
-hud.msg.state=Status
-hud.msg.delay=Vertraging
-hud.msg.comparator=Vergelijker
-hud.msg.substractor=Aftrekker
-hud.msg.record=Neem op
-
-option.appeng.monitorcontent=Scherm inhoud
-option.bb.content=Ton inhoud
-option.bc.tankamount=Vloeistofhoeveelheid
-option.bc.tanktype=Vloeistoftype
-option.enderstorage.colors=Kleuren
-option.ic2.inputeumach=Max EU invoer [Machines]
-option.ic2.inputeuother=Max EU invoer [Andere]
-option.ic2.inputeu=Max EU invoer
-option.ic2.outputeu=Max EU uitvoer
-option.ic2.storage=Opgeslagen energie
-option.thaumcraft.storedvis=Condensator opslag
-option.thermalexpansion.energyhandler=Toon RF opslag
-option.thermalexpansion.energycell=Toon ECell IN/UIT
-option.thermalexpansion.fluidtype=Toon vloeistoftype
-option.thermalexpansion.fluidamount=Toon vloeistofhoeveelheid
-option.thermalexpansion.tankmode=Toon tank modus
-option.thermalexpansion.tesssendrecv=Tesseract modus
-option.thermalexpansion.tessfreq=Tesseract frequentie
-option.thermalexpansion.owner=Toon eigenaar
-option.vanilla.spawntype=Spawner type
-option.vanilla.growthvalue=Groei hoeveelheid
-option.vanilla.leverstate=Hendel status
-option.vanilla.repeater=Herhaler vertraging
-option.vanilla.comparator=Vergelijker modus
-option.vanilla.redstone=Redstone vermogen
-option.vanilla.jukebox=Jukebox schijf
-option.extrautilities.fluidamount=Toon vloeistofhoeveelheid
-option.openblocks.fluidamount=Toon vloeistofhoeveelheid
+screen.button.waila=Waila
+screen.button.modules=Modules
+screen.label.scale=Schaal
+screen.label.dragtuto=Sleep de HUD om zijn positie in te stellen.
+
+screen.button.default=Standaard
+screen.button.cancel=Annuleren
+screen.button.ok=Ok
+screen.button.yes=Ja
+screen.button.no=Nee
+screen.button.back=Terug
+screen.button.hidden=Verborgen
+screen.button.visible=Zichtbaar
+screen.button.maintained=Gehandhaafd
+screen.button.toggled=Omgeschakeld
+
+choice.showhidewaila=Toon/Verberg Waila
+choice.showhideidmeta=Toon ID:Metadata
+choice.toggledmaintained=Omgeschakeld/Gehandhaafd
+choice.showliquids=Vloeistoffen
+screen.button.configureaspect=Configureer aspect...
+
+enchant.title.name=Naam
+enchant.title.minlvl=Min lvl
+enchant.title.maxlvl=Max lvl
+enchant.title.weight=Gewicht
+enchant.label.enchantability=Enchantbaarheid
+
+keybind.configscreen=[Waila] Configuratiescherm
+keybind.showhide=[Waila] Toon/Verberg
+keybind.showliquid=[Waila] Toon vloeistoffen
+keybind.showrecipe=[Waila] Toon recepten
+keybind.showusage=[Waila] Toon gebruik
+keybind.testing=[Waila] Testen
+
+client.msg.norecipe=Geen recept gevonden.
+client.msg.nousage=Geen gebruik gevonden.
+
+hud.msg.none=<Geen>
+hud.msg.empty=<Leeg>
+hud.msg.output=Uitvoer
+hud.msg.input=Invoer
+hud.msg.out=Uit
+hud.msg.in=In
+hud.msg.power=Vermogen
+hud.msg.storage=Opslag
+hud.msg.any=Om het even welke
+hud.msg.mode=Modus
+
+hud.msg.send=Zend
+hud.msg.recv=Ontv
+hud.msg.item=Item
+hud.msg.fluid=Vloeistof
+hud.msg.energ=Energie
+hud.msg.frequency=Frequentie
+
+hud.msg.owner=Eigenaar
+hud.msg.public=Publiek
+hud.msg.restricted=Begrensd
+hud.msg.private=Privé
+
+hud.msg.white=Wit
+hud.msg.orange=Oranje
+hud.msg.magenta=Magenta
+hud.msg.lblue=LBlauw
+hud.msg.yellow=Geel
+hud.msg.lime=Limoen
+hud.msg.pink=Roze
+hud.msg.gray=Grijs
+hud.msg.lgray=LGrijs
+hud.msg.cyan=Cyaan
+hud.msg.purple=Paars
+hud.msg.blue=Blauw
+hud.msg.brown=Bruin
+hud.msg.green=Groen
+hud.msg.red=Rood
+hud.msg.black=Zwart
+
+hud.msg.growth=Groei
+hud.msg.mature=Volwassen
+hud.msg.off=Af
+hud.msg.on=Aan
+hud.msg.state=Status
+hud.msg.delay=Vertraging
+hud.msg.comparator=Vergelijker
+hud.msg.substractor=Aftrekker
+hud.msg.record=Neem op
+
+option.appeng.monitorcontent=Scherm inhoud
+option.bb.content=Ton inhoud
+option.bc.tankamount=Vloeistofhoeveelheid
+option.bc.tanktype=Vloeistoftype
+option.enderstorage.colors=Kleuren
+option.ic2.inputeumach=Max EU invoer [Machines]
+option.ic2.inputeuother=Max EU invoer [Andere]
+option.ic2.inputeu=Max EU invoer
+option.ic2.outputeu=Max EU uitvoer
+option.ic2.storage=Opgeslagen energie
+option.thaumcraft.storedvis=Condensator opslag
+option.thermalexpansion.energyhandler=Toon RF opslag
+option.thermalexpansion.energycell=Toon ECell IN/UIT
+option.thermalexpansion.fluidtype=Toon vloeistoftype
+option.thermalexpansion.fluidamount=Toon vloeistofhoeveelheid
+option.thermalexpansion.tankmode=Toon tank modus
+option.thermalexpansion.tesssendrecv=Tesseract modus
+option.thermalexpansion.tessfreq=Tesseract frequentie
+option.thermalexpansion.owner=Toon eigenaar
+option.vanilla.spawntype=Spawner type
+option.vanilla.growthvalue=Groei hoeveelheid
+option.vanilla.leverstate=Hendel status
+option.vanilla.repeater=Herhaler vertraging
+option.vanilla.comparator=Vergelijker modus
+option.vanilla.redstone=Redstone vermogen
+option.vanilla.jukebox=Jukebox schijf
+option.extrautilities.fluidamount=Toon vloeistofhoeveelheid
+option.openblocks.fluidamount=Toon vloeistofhoeveelheid
 option.railcraft.fluidamount=Toon vloeistofhoeveelheid

assets/waila/lang/ru_RU.lang

@@ -1,131 +1,131 @@
-screen.button.waila=Waila
-screen.button.modules=Модули
-screen.label.scale=Размер
-screen.label.dragtuto=Перетащите интерфейс, чтобы изменить позицию.
-
-screen.button.default=По умолчанию
-screen.button.cancel=Отмена
-screen.button.ok=Ок
-screen.button.yes=Да
-screen.button.no=Нет
-screen.button.back=Назад
-screen.button.hidden=Скрывать
-screen.button.visible=Показывать
-screen.button.maintained=При нажатой клавише
-screen.button.toggled=Вкл./Выкл. гор. клавишей
-
-choice.showhidewaila=Показать/Скрыть Waila
-choice.showhideidmeta=Показать ID:Метаданные
-choice.toggledmaintained=Переключ./Нажатая клав.
-choice.showliquids=Жидкости
-screen.button.configureaspect=Настроить индикатор...
-
-enchant.title.name=Название
-enchant.title.minlvl=Мин. уровень
-enchant.title.maxlvl=Макс. уровень
-enchant.title.weight=Вес
-enchant.label.enchantability=Зачарование
-
-waila.keybind.wailaconfig=[Waila] Меню настроек
-waila.keybind.wailadisplay=[Waila] Показать/Скрыть
-waila.keybind.liquid=[Waila] Показать жидкости
-waila.keybind.recipe=[Waila] Показать рецепт
-waila.keybind.usage=[Waila] Показать применение
-waila.keybind.testing=[Waila] Тестировать
-
-client.msg.norecipe=Рецептов не найдено.
-client.msg.nousage=Применений не найдено.
-
-hud.msg.none=<Ничего>
-hud.msg.empty=<Пусто>
-hud.msg.output=Вывод
-hud.msg.input=Ввод
-hud.msg.out=Из
-hud.msg.in=В
-hud.msg.power=Энергия
-hud.msg.storage=Хранилище
-hud.msg.any=Всё
-hud.msg.mode=Режим
-hud.msg.maxpower=Макс. энергия
-hud.msg.trigger=Триггер
-hud.msg.maxio=Макс. ввод/вывод
-
-hud.msg.send=Передача
-hud.msg.recv=Приём
-hud.msg.item=Предмет
-hud.msg.fluid=Жидкость
-hud.msg.energ=Энергия
-hud.msg.frequency=Частота
-
-hud.msg.owner=Владелец
-hud.msg.public=Публичный
-hud.msg.restricted=Ограниченный
-hud.msg.private=Приватный
-
-hud.msg.white=Белый
-hud.msg.orange=Оранжевый
-hud.msg.magenta=Сиреневый
-hud.msg.lblue=Светло-синий
-hud.msg.yellow=Жёлтый
-hud.msg.lime=Светло-зелёный
-hud.msg.pink=Розовый
-hud.msg.gray=Серый
-hud.msg.lgray=Светло-серый
-hud.msg.cyan=Бирюзовый
-hud.msg.purple=Фиолетовый
-hud.msg.blue=Синий
-hud.msg.brown=Коричневый
-hud.msg.green=Зелёный
-hud.msg.red=Красный
-hud.msg.black=Чёрный
-
-hud.msg.growth=Рост
-hud.msg.mature=Вырос
-hud.msg.off=Выкл.
-hud.msg.on=Вкл.
-hud.msg.state=Статус
-hud.msg.delay=Задержка
-hud.msg.comparator=Компаратор
-hud.msg.substractor=Вычитатель
-hud.msg.record=Пластинка
-
-option.appeng.monitorcontent=Содержимое монитора
-option.bb.content=Содержимое бочки
-option.bc.tankamount=Кол-во жидкости
-option.bc.tanktype=Тип жидкости
-option.enderstorage.colors=Цвета
-option.ic2.inputeumach=Макс. ввод еЭ [Машины]
-option.ic2.inputeuother=Макс. ввод еЭ [Другое]
-option.ic2.inputeu=Макс. ввод еЭ
-option.ic2.outputeu=Макс. вывод еЭ
-option.ic2.storage=Заряд энергии
-option.thaumcraft.storedvis=Заряд конденсатора
-option.thermalexpansion.energyhandler=Показывать заряд заряжателя
-option.thermalexpansion.energycell=Показывать Ввод/Вывод Р.батареи
-option.thermalexpansion.fluidtype=Показывать тип жидкости
-option.thermalexpansion.fluidamount=Показывать кол-во жидкости
-option.thermalexpansion.tankmode=Режим цистерны
-option.thermalexpansion.tesssendrecv=Режим тессеракта
-option.thermalexpansion.tessfreq=Частота тессеракта
-option.thermalexpansion.owner=Показывать владельца
-option.thermalexpansion.conditemmode=Показывать режим труб
-option.vanilla.spawntype=Тип спаунера
-option.vanilla.growthvalue=Стадия роста
-option.vanilla.leverstate=Положение рычага
-option.vanilla.repeater=Задержка повторителя
-option.vanilla.comparator=Режим компаратора
-option.vanilla.redstone=Сила красного камня
-option.vanilla.jukebox=Пластинка в проигрывателе
-option.etb.displaydata=Показывать инф. о сокетах
-option.enderio.inout=Показывать ввод/вывод
-option.enderio.storage=Показывать заряд MJ
-option.enderio.owner=Показывать владельца блока
-option.enderio.channel=Показывать канал гиперкуба
-option.bcapi.storage=Показывать заряд MJ
-option.bcapi.consump=Показывать макс. энергию
-option.bcapi.trigger=Показывать энергию активации
-option.pr.showio=Показывать ввод/вывод схем
-option.pr.showdata=Показывать инф. о схемах
-option.extrautilities.fluidamount=Показывать кол-во жидкости
-option.openblocks.fluidamount=Показывать кол-во жидкости
+screen.button.waila=Waila
+screen.button.modules=Модули
+screen.label.scale=Размер
+screen.label.dragtuto=Перетащите интерфейс, чтобы изменить позицию.
+
+screen.button.default=По умолчанию
+screen.button.cancel=Отмена
+screen.button.ok=Ок
+screen.button.yes=Да
+screen.button.no=Нет
+screen.button.back=Назад
+screen.button.hidden=Скрывать
+screen.button.visible=Показывать
+screen.button.maintained=При нажатой клавише
+screen.button.toggled=Вкл./Выкл. гор. клавишей
+
+choice.showhidewaila=Показать/Скрыть Waila
+choice.showhideidmeta=Показать ID:Метаданные
+choice.toggledmaintained=Переключ./Нажатая клав.
+choice.showliquids=Жидкости
+screen.button.configureaspect=Настроить индикатор...
+
+enchant.title.name=Название
+enchant.title.minlvl=Мин. уровень
+enchant.title.maxlvl=Макс. уровень
+enchant.title.weight=Вес
+enchant.label.enchantability=Зачарование
+
+waila.keybind.wailaconfig=[Waila] Меню настроек
+waila.keybind.wailadisplay=[Waila] Показать/Скрыть
+waila.keybind.liquid=[Waila] Показать жидкости
+waila.keybind.recipe=[Waila] Показать рецепт
+waila.keybind.usage=[Waila] Показать применение
+waila.keybind.testing=[Waila] Тестировать
+
+client.msg.norecipe=Рецептов не найдено.
+client.msg.nousage=Применений не найдено.
+
+hud.msg.none=<Ничего>
+hud.msg.empty=<Пусто>
+hud.msg.output=Вывод
+hud.msg.input=Ввод
+hud.msg.out=Из
+hud.msg.in=В
+hud.msg.power=Энергия
+hud.msg.storage=Хранилище
+hud.msg.any=Всё
+hud.msg.mode=Режим
+hud.msg.maxpower=Макс. энергия
+hud.msg.trigger=Триггер
+hud.msg.maxio=Макс. ввод/вывод
+
+hud.msg.send=Передача
+hud.msg.recv=Приём
+hud.msg.item=Предмет
+hud.msg.fluid=Жидкость
+hud.msg.energ=Энергия
+hud.msg.frequency=Частота
+
+hud.msg.owner=Владелец
+hud.msg.public=Публичный
+hud.msg.restricted=Ограниченный
+hud.msg.private=Приватный
+
+hud.msg.white=Белый
+hud.msg.orange=Оранжевый
+hud.msg.magenta=Сиреневый
+hud.msg.lblue=Светло-синий
+hud.msg.yellow=Жёлтый
+hud.msg.lime=Светло-зелёный
+hud.msg.pink=Розовый
+hud.msg.gray=Серый
+hud.msg.lgray=Светло-серый
+hud.msg.cyan=Бирюзовый
+hud.msg.purple=Фиолетовый
+hud.msg.blue=Синий
+hud.msg.brown=Коричневый
+hud.msg.green=Зелёный
+hud.msg.red=Красный
+hud.msg.black=Чёрный
+
+hud.msg.growth=Рост
+hud.msg.mature=Вырос
+hud.msg.off=Выкл.
+hud.msg.on=Вкл.
+hud.msg.state=Статус
+hud.msg.delay=Задержка
+hud.msg.comparator=Компаратор
+hud.msg.substractor=Вычитатель
+hud.msg.record=Пластинка
+
+option.appeng.monitorcontent=Содержимое монитора
+option.bb.content=Содержимое бочки
+option.bc.tankamount=Кол-во жидкости
+option.bc.tanktype=Тип жидкости
+option.enderstorage.colors=Цвета
+option.ic2.inputeumach=Макс. ввод еЭ [Машины]
+option.ic2.inputeuother=Макс. ввод еЭ [Другое]
+option.ic2.inputeu=Макс. ввод еЭ
+option.ic2.outputeu=Макс. вывод еЭ
+option.ic2.storage=Заряд энергии
+option.thaumcraft.storedvis=Заряд конденсатора
+option.thermalexpansion.energyhandler=Показывать заряд заряжателя
+option.thermalexpansion.energycell=Показывать Ввод/Вывод Р.батареи
+option.thermalexpansion.fluidtype=Показывать тип жидкости
+option.thermalexpansion.fluidamount=Показывать кол-во жидкости
+option.thermalexpansion.tankmode=Режим цистерны
+option.thermalexpansion.tesssendrecv=Режим тессеракта
+option.thermalexpansion.tessfreq=Частота тессеракта
+option.thermalexpansion.owner=Показывать владельца
+option.thermalexpansion.conditemmode=Показывать режим труб
+option.vanilla.spawntype=Тип спаунера
+option.vanilla.growthvalue=Стадия роста
+option.vanilla.leverstate=Положение рычага
+option.vanilla.repeater=Задержка повторителя
+option.vanilla.comparator=Режим компаратора
+option.vanilla.redstone=Сила красного камня
+option.vanilla.jukebox=Пластинка в проигрывателе
+option.etb.displaydata=Показывать инф. о сокетах
+option.enderio.inout=Показывать ввод/вывод
+option.enderio.storage=Показывать заряд MJ
+option.enderio.owner=Показывать владельца блока
+option.enderio.channel=Показывать канал гиперкуба
+option.bcapi.storage=Показывать заряд MJ
+option.bcapi.consump=Показывать макс. энергию
+option.bcapi.trigger=Показывать энергию активации
+option.pr.showio=Показывать ввод/вывод схем
+option.pr.showdata=Показывать инф. о схемах
+option.extrautilities.fluidamount=Показывать кол-во жидкости
+option.openblocks.fluidamount=Показывать кол-во жидкости
 option.railcraft.fluidamount=Показывать кол-во жидкости

au/com/bytecode/opencsv/CSVParser.java

@@ -1,323 +1,323 @@
-package au.com.bytecode.opencsv;
-
-/**
- Copyright 2005 Bytecode Pty Ltd.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * A very simple CSV parser released under a commercial-friendly license.
- * This just implements splitting a single line into fields.
- *
- * @author Glen Smith
- * @author Rainer Pruy
- */
-public class CSVParser {
-
-    private final char separator;
-
-    private final char quotechar;
-
-    private final char escape;
-
-    private final boolean strictQuotes;
-
-    private String pending;
-    private boolean inField = false;
-
-    private final boolean ignoreLeadingWhiteSpace;
-
-    /**
-     * The default separator to use if none is supplied to the constructor.
-     */
-    public static final char DEFAULT_SEPARATOR = ',';
-
-    public static final int INITIAL_READ_SIZE = 128;
-
-    /**
-     * The default quote character to use if none is supplied to the
-     * constructor.
-     */
-    public static final char DEFAULT_QUOTE_CHARACTER = '"';
-
-
-    /**
-     * The default escape character to use if none is supplied to the
-     * constructor.
-     */
-    public static final char DEFAULT_ESCAPE_CHARACTER = '\\';
-
-    /**
-     * The default strict quote behavior to use if none is supplied to the
-     * constructor
-     */
-    public static final boolean DEFAULT_STRICT_QUOTES = false;
-
-    /**
-     * The default leading whitespace behavior to use if none is supplied to the
-     * constructor
-     */
-    public static final boolean DEFAULT_IGNORE_LEADING_WHITESPACE = true;
-
-    /**
-     * This is the "null" character - if a value is set to this then it is ignored.
-     * I.E. if the quote character is set to null then there is no quote character.
-     */
-    public static final char NULL_CHARACTER = '\0';
-
-    /**
-     * Constructs CSVParser using a comma for the separator.
-     */
-    public CSVParser() {
-        this(DEFAULT_SEPARATOR, DEFAULT_QUOTE_CHARACTER, DEFAULT_ESCAPE_CHARACTER);
-    }
-
-    /**
-     * Constructs CSVParser with supplied separator.
-     *
-     * @param separator the delimiter to use for separating entries.
-     */
-    public CSVParser(char separator) {
-        this(separator, DEFAULT_QUOTE_CHARACTER, DEFAULT_ESCAPE_CHARACTER);
-    }
-
-
-    /**
-     * Constructs CSVParser with supplied separator and quote char.
-     *
-     * @param separator the delimiter to use for separating entries
-     * @param quotechar the character to use for quoted elements
-     */
-    public CSVParser(char separator, char quotechar) {
-        this(separator, quotechar, DEFAULT_ESCAPE_CHARACTER);
-    }
-
-    /**
-     * Constructs CSVReader with supplied separator and quote char.
-     *
-     * @param separator the delimiter to use for separating entries
-     * @param quotechar the character to use for quoted elements
-     * @param escape    the character to use for escaping a separator or quote
-     */
-    public CSVParser(char separator, char quotechar, char escape) {
-        this(separator, quotechar, escape, DEFAULT_STRICT_QUOTES);
-    }
-
-    /**
-     * Constructs CSVReader with supplied separator and quote char.
-     * Allows setting the "strict quotes" flag
-     *
-     * @param separator    the delimiter to use for separating entries
-     * @param quotechar    the character to use for quoted elements
-     * @param escape       the character to use for escaping a separator or quote
-     * @param strictQuotes if true, characters outside the quotes are ignored
-     */
-    public CSVParser(char separator, char quotechar, char escape, boolean strictQuotes) {
-        this(separator, quotechar, escape, strictQuotes, DEFAULT_IGNORE_LEADING_WHITESPACE);
-    }
-
-    /**
-     * Constructs CSVReader with supplied separator and quote char.
-     * Allows setting the "strict quotes" and "ignore leading whitespace" flags
-     *
-     * @param separator               the delimiter to use for separating entries
-     * @param quotechar               the character to use for quoted elements
-     * @param escape                  the character to use for escaping a separator or quote
-     * @param strictQuotes            if true, characters outside the quotes are ignored
-     * @param ignoreLeadingWhiteSpace if true, white space in front of a quote in a field is ignored
-     */
-    public CSVParser(char separator, char quotechar, char escape, boolean strictQuotes, boolean ignoreLeadingWhiteSpace) {
-        if (anyCharactersAreTheSame(separator, quotechar, escape)) {
-            throw new UnsupportedOperationException("The separator, quote, and escape characters must be different!");
-        }
-        if (separator == NULL_CHARACTER) {
-            throw new UnsupportedOperationException("The separator character must be defined!");
-        }
-        this.separator = separator;
-        this.quotechar = quotechar;
-        this.escape = escape;
-        this.strictQuotes = strictQuotes;
-        this.ignoreLeadingWhiteSpace = ignoreLeadingWhiteSpace;
-    }
-
-    private boolean anyCharactersAreTheSame(char separator, char quotechar, char escape) {
-        return isSameCharacter(separator, quotechar) || isSameCharacter(separator, escape) || isSameCharacter(quotechar, escape);
-    }
-
-    private boolean isSameCharacter(char c1, char c2) {
-        return c1 != NULL_CHARACTER && c1 == c2;
-    }
-
-    /**
-     * @return true if something was left over from last call(s)
-     */
-    public boolean isPending() {
-        return pending != null;
-    }
-
-    public String[] parseLineMulti(String nextLine) throws IOException {
-        return parseLine(nextLine, true);
-    }
-
-    public String[] parseLine(String nextLine) throws IOException {
-        return parseLine(nextLine, false);
-    }
-
-    /**
-     * Parses an incoming String and returns an array of elements.
-     *
-     * @param nextLine the string to parse
-     * @param multi
-     * @return the comma-tokenized list of elements, or null if nextLine is null
-     * @throws IOException if bad things happen during the read
-     */
-    private String[] parseLine(String nextLine, boolean multi) throws IOException {
-
-        if (!multi && pending != null) {
-            pending = null;
-        }
-
-        if (nextLine == null) {
-            if (pending != null) {
-                String s = pending;
-                pending = null;
-                return new String[]{s};
-            } else {
-                return null;
-            }
-        }
-
-        List<String> tokensOnThisLine = new ArrayList<String>();
-        StringBuilder sb = new StringBuilder(INITIAL_READ_SIZE);
-        boolean inQuotes = false;
-        if (pending != null) {
-            sb.append(pending);
-            pending = null;
-            inQuotes = true;
-        }
-        for (int i = 0; i < nextLine.length(); i++) {
-
-            char c = nextLine.charAt(i);
-            if (c == this.escape) {
-                if (isNextCharacterEscapable(nextLine, inQuotes || inField, i)) {
-                    sb.append(nextLine.charAt(i + 1));
-                    i++;
-                }
-            } else if (c == quotechar) {
-                if (isNextCharacterEscapedQuote(nextLine, inQuotes || inField, i)) {
-                    sb.append(nextLine.charAt(i + 1));
-                    i++;
-                } else {
-                    //inQuotes = !inQuotes;
-
-                    // the tricky case of an embedded quote in the middle: a,bc"d"ef,g
-                    if (!strictQuotes) {
-                        if (i > 2 //not on the beginning of the line
-                                && nextLine.charAt(i - 1) != this.separator //not at the beginning of an escape sequence
-                                && nextLine.length() > (i + 1) &&
-                                nextLine.charAt(i + 1) != this.separator //not at the	end of an escape sequence
-                                ) {
-
-                            if (ignoreLeadingWhiteSpace && sb.length() > 0 && isAllWhiteSpace(sb)) {
-                                sb.setLength(0);  //discard white space leading up to quote
-                            } else {
-                                sb.append(c);
-                                //continue;
-                            }
-
-                        }
-                    }
-
-                    inQuotes = !inQuotes;
-                }
-                inField = !inField;
-            } else if (c == separator && !inQuotes) {
-                tokensOnThisLine.add(sb.toString());
-                sb.setLength(0); // start work on next token
-                inField = false;
-            } else {
-                if (!strictQuotes || inQuotes) {
-                    sb.append(c);
-                    inField = true;
-                }
-            }
-        }
-        // line is done - check status
-        if (inQuotes) {
-            if (multi) {
-                // continuing a quoted section, re-append newline
-                sb.append("\n");
-                pending = sb.toString();
-                sb = null; // this partial content is not to be added to field list yet
-            } else {
-                throw new IOException("Un-terminated quoted field at end of CSV line");
-            }
-        }
-        if (sb != null) {
-            tokensOnThisLine.add(sb.toString());
-        }
-        return tokensOnThisLine.toArray(new String[tokensOnThisLine.size()]);
-
-    }
-
-    /**
-     * precondition: the current character is a quote or an escape
-     *
-     * @param nextLine the current line
-     * @param inQuotes true if the current context is quoted
-     * @param i        current index in line
-     * @return true if the following character is a quote
-     */
-    private boolean isNextCharacterEscapedQuote(String nextLine, boolean inQuotes, int i) {
-        return inQuotes  // we are in quotes, therefore there can be escaped quotes in here.
-                && nextLine.length() > (i + 1)  // there is indeed another character to check.
-                && nextLine.charAt(i + 1) == quotechar;
-    }
-
-    /**
-     * precondition: the current character is an escape
-     *
-     * @param nextLine the current line
-     * @param inQuotes true if the current context is quoted
-     * @param i        current index in line
-     * @return true if the following character is a quote
-     */
-    protected boolean isNextCharacterEscapable(String nextLine, boolean inQuotes, int i) {
-        return inQuotes  // we are in quotes, therefore there can be escaped quotes in here.
-                && nextLine.length() > (i + 1)  // there is indeed another character to check.
-                && (nextLine.charAt(i + 1) == quotechar || nextLine.charAt(i + 1) == this.escape);
-    }
-
-    /**
-     * precondition: sb.length() > 0
-     *
-     * @param sb A sequence of characters to examine
-     * @return true if every character in the sequence is whitespace
-     */
-    protected boolean isAllWhiteSpace(CharSequence sb) {
-        boolean result = true;
-        for (int i = 0; i < sb.length(); i++) {
-            char c = sb.charAt(i);
-
-            if (!Character.isWhitespace(c)) {
-                return false;
-            }
-        }
-        return result;
-    }
-}
+package au.com.bytecode.opencsv;
+
+/**
+ Copyright 2005 Bytecode Pty Ltd.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A very simple CSV parser released under a commercial-friendly license.
+ * This just implements splitting a single line into fields.
+ *
+ * @author Glen Smith
+ * @author Rainer Pruy
+ */
+public class CSVParser {
+
+    private final char separator;
+
+    private final char quotechar;
+
+    private final char escape;
+
+    private final boolean strictQuotes;
+
+    private String pending;
+    private boolean inField = false;
+
+    private final boolean ignoreLeadingWhiteSpace;
+
+    /**
+     * The default separator to use if none is supplied to the constructor.
+     */
+    public static final char DEFAULT_SEPARATOR = ',';
+
+    public static final int INITIAL_READ_SIZE = 128;
+
+    /**
+     * The default quote character to use if none is supplied to the
+     * constructor.
+     */
+    public static final char DEFAULT_QUOTE_CHARACTER = '"';
+
+
+    /**
+     * The default escape character to use if none is supplied to the
+     * constructor.
+     */
+    public static final char DEFAULT_ESCAPE_CHARACTER = '\\';
+
+    /**
+     * The default strict quote behavior to use if none is supplied to the
+     * constructor
+     */
+    public static final boolean DEFAULT_STRICT_QUOTES = false;
+
+    /**
+     * The default leading whitespace behavior to use if none is supplied to the
+     * constructor
+     */
+    public static final boolean DEFAULT_IGNORE_LEADING_WHITESPACE = true;
+
+    /**
+     * This is the "null" character - if a value is set to this then it is ignored.
+     * I.E. if the quote character is set to null then there is no quote character.
+     */
+    public static final char NULL_CHARACTER = '\0';
+
+    /**
+     * Constructs CSVParser using a comma for the separator.
+     */
+    public CSVParser() {
+        this(DEFAULT_SEPARATOR, DEFAULT_QUOTE_CHARACTER, DEFAULT_ESCAPE_CHARACTER);
+    }
+
+    /**
+     * Constructs CSVParser with supplied separator.
+     *
+     * @param separator the delimiter to use for separating entries.
+     */
+    public CSVParser(char separator) {
+        this(separator, DEFAULT_QUOTE_CHARACTER, DEFAULT_ESCAPE_CHARACTER);
+    }
+
+
+    /**
+     * Constructs CSVParser with supplied separator and quote char.
+     *
+     * @param separator the delimiter to use for separating entries
+     * @param quotechar the character to use for quoted elements
+     */
+    public CSVParser(char separator, char quotechar) {
+        this(separator, quotechar, DEFAULT_ESCAPE_CHARACTER);
+    }
+
+    /**
+     * Constructs CSVReader with supplied separator and quote char.
+     *
+     * @param separator the delimiter to use for separating entries
+     * @param quotechar the character to use for quoted elements
+     * @param escape    the character to use for escaping a separator or quote
+     */
+    public CSVParser(char separator, char quotechar, char escape) {
+        this(separator, quotechar, escape, DEFAULT_STRICT_QUOTES);
+    }
+
+    /**
+     * Constructs CSVReader with supplied separator and quote char.
+     * Allows setting the "strict quotes" flag
+     *
+     * @param separator    the delimiter to use for separating entries
+     * @param quotechar    the character to use for quoted elements
+     * @param escape       the character to use for escaping a separator or quote
+     * @param strictQuotes if true, characters outside the quotes are ignored
+     */
+    public CSVParser(char separator, char quotechar, char escape, boolean strictQuotes) {
+        this(separator, quotechar, escape, strictQuotes, DEFAULT_IGNORE_LEADING_WHITESPACE);
+    }
+
+    /**
+     * Constructs CSVReader with supplied separator and quote char.
+     * Allows setting the "strict quotes" and "ignore leading whitespace" flags
+     *
+     * @param separator               the delimiter to use for separating entries
+     * @param quotechar               the character to use for quoted elements
+     * @param escape                  the character to use for escaping a separator or quote
+     * @param strictQuotes            if true, characters outside the quotes are ignored
+     * @param ignoreLeadingWhiteSpace if true, white space in front of a quote in a field is ignored
+     */
+    public CSVParser(char separator, char quotechar, char escape, boolean strictQuotes, boolean ignoreLeadingWhiteSpace) {
+        if (anyCharactersAreTheSame(separator, quotechar, escape)) {
+            throw new UnsupportedOperationException("The separator, quote, and escape characters must be different!");
+        }
+        if (separator == NULL_CHARACTER) {
+            throw new UnsupportedOperationException("The separator character must be defined!");
+        }
+        this.separator = separator;
+        this.quotechar = quotechar;
+        this.escape = escape;
+        this.strictQuotes = strictQuotes;
+        this.ignoreLeadingWhiteSpace = ignoreLeadingWhiteSpace;
+    }
+
+    private boolean anyCharactersAreTheSame(char separator, char quotechar, char escape) {
+        return isSameCharacter(separator, quotechar) || isSameCharacter(separator, escape) || isSameCharacter(quotechar, escape);
+    }
+
+    private boolean isSameCharacter(char c1, char c2) {
+        return c1 != NULL_CHARACTER && c1 == c2;
+    }
+
+    /**
+     * @return true if something was left over from last call(s)
+     */
+    public boolean isPending() {
+        return pending != null;
+    }
+
+    public String[] parseLineMulti(String nextLine) throws IOException {
+        return parseLine(nextLine, true);
+    }
+
+    public String[] parseLine(String nextLine) throws IOException {
+        return parseLine(nextLine, false);
+    }
+
+    /**
+     * Parses an incoming String and returns an array of elements.
+     *
+     * @param nextLine the string to parse
+     * @param multi
+     * @return the comma-tokenized list of elements, or null if nextLine is null
+     * @throws IOException if bad things happen during the read
+     */
+    private String[] parseLine(String nextLine, boolean multi) throws IOException {
+
+        if (!multi && pending != null) {
+            pending = null;
+        }
+
+        if (nextLine == null) {
+            if (pending != null) {
+                String s = pending;
+                pending = null;
+                return new String[]{s};
+            } else {
+                return null;
+            }
+        }
+
+        List<String> tokensOnThisLine = new ArrayList<String>();
+        StringBuilder sb = new StringBuilder(INITIAL_READ_SIZE);
+        boolean inQuotes = false;
+        if (pending != null) {
+            sb.append(pending);
+            pending = null;
+            inQuotes = true;
+        }
+        for (int i = 0; i < nextLine.length(); i++) {
+
+            char c = nextLine.charAt(i);
+            if (c == this.escape) {
+                if (isNextCharacterEscapable(nextLine, inQuotes || inField, i)) {
+                    sb.append(nextLine.charAt(i + 1));
+                    i++;
+                }
+            } else if (c == quotechar) {
+                if (isNextCharacterEscapedQuote(nextLine, inQuotes || inField, i)) {
+                    sb.append(nextLine.charAt(i + 1));
+                    i++;
+                } else {
+                    //inQuotes = !inQuotes;
+
+                    // the tricky case of an embedded quote in the middle: a,bc"d"ef,g
+                    if (!strictQuotes) {
+                        if (i > 2 //not on the beginning of the line
+                                && nextLine.charAt(i - 1) != this.separator //not at the beginning of an escape sequence
+                                && nextLine.length() > (i + 1) &&
+                                nextLine.charAt(i + 1) != this.separator //not at the	end of an escape sequence
+                                ) {
+
+                            if (ignoreLeadingWhiteSpace && sb.length() > 0 && isAllWhiteSpace(sb)) {
+                                sb.setLength(0);  //discard white space leading up to quote
+                            } else {
+                                sb.append(c);
+                                //continue;
+                            }
+
+                        }
+                    }
+
+                    inQuotes = !inQuotes;
+                }
+                inField = !inField;
+            } else if (c == separator && !inQuotes) {
+                tokensOnThisLine.add(sb.toString());
+                sb.setLength(0); // start work on next token
+                inField = false;
+            } else {
+                if (!strictQuotes || inQuotes) {
+                    sb.append(c);
+                    inField = true;
+                }
+            }
+        }
+        // line is done - check status
+        if (inQuotes) {
+            if (multi) {
+                // continuing a quoted section, re-append newline
+                sb.append("\n");
+                pending = sb.toString();
+                sb = null; // this partial content is not to be added to field list yet
+            } else {
+                throw new IOException("Un-terminated quoted field at end of CSV line");
+            }
+        }
+        if (sb != null) {
+            tokensOnThisLine.add(sb.toString());
+        }
+        return tokensOnThisLine.toArray(new String[tokensOnThisLine.size()]);
+
+    }
+
+    /**
+     * precondition: the current character is a quote or an escape
+     *
+     * @param nextLine the current line
+     * @param inQuotes true if the current context is quoted
+     * @param i        current index in line
+     * @return true if the following character is a quote
+     */
+    private boolean isNextCharacterEscapedQuote(String nextLine, boolean inQuotes, int i) {
+        return inQuotes  // we are in quotes, therefore there can be escaped quotes in here.
+                && nextLine.length() > (i + 1)  // there is indeed another character to check.
+                && nextLine.charAt(i + 1) == quotechar;
+    }
+
+    /**
+     * precondition: the current character is an escape
+     *
+     * @param nextLine the current line
+     * @param inQuotes true if the current context is quoted
+     * @param i        current index in line
+     * @return true if the following character is a quote
+     */
+    protected boolean isNextCharacterEscapable(String nextLine, boolean inQuotes, int i) {
+        return inQuotes  // we are in quotes, therefore there can be escaped quotes in here.
+                && nextLine.length() > (i + 1)  // there is indeed another character to check.
+                && (nextLine.charAt(i + 1) == quotechar || nextLine.charAt(i + 1) == this.escape);
+    }
+
+    /**
+     * precondition: sb.length() > 0
+     *
+     * @param sb A sequence of characters to examine
+     * @return true if every character in the sequence is whitespace
+     */
+    protected boolean isAllWhiteSpace(CharSequence sb) {
+        boolean result = true;
+        for (int i = 0; i < sb.length(); i++) {
+            char c = sb.charAt(i);
+
+            if (!Character.isWhitespace(c)) {
+                return false;
+            }
+        }
+        return result;
+    }
+}

au/com/bytecode/opencsv/CSVReader.java

@@ -1,282 +1,282 @@
-package au.com.bytecode.opencsv;
-
-/**
- Copyright 2005 Bytecode Pty Ltd.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-import java.io.BufferedReader;
-import java.io.Closeable;
-import java.io.IOException;
-import java.io.Reader;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * A very simple CSV reader released under a commercial-friendly license.
- * 
- * @author Glen Smith
- * 
- */
-public class CSVReader implements Closeable {
-
-    private BufferedReader br;
-
-    private boolean hasNext = true;
-
-    private CSVParser parser;
-    
-    private int skipLines;
-
-    private boolean linesSkiped;
-
-    /**
-     * The default line to start reading.
-     */
-    public static final int DEFAULT_SKIP_LINES = 0;
-
-    /**
-     * Constructs CSVReader using a comma for the separator.
-     * 
-     * @param reader
-     *            the reader to an underlying CSV source.
-     */
-    public CSVReader(Reader reader) {
-        this(reader, CSVParser.DEFAULT_SEPARATOR, CSVParser.DEFAULT_QUOTE_CHARACTER, CSVParser.DEFAULT_ESCAPE_CHARACTER);
-    }
-
-    /**
-     * Constructs CSVReader with supplied separator.
-     * 
-     * @param reader
-     *            the reader to an underlying CSV source.
-     * @param separator
-     *            the delimiter to use for separating entries.
-     */
-    public CSVReader(Reader reader, char separator) {
-        this(reader, separator, CSVParser.DEFAULT_QUOTE_CHARACTER, CSVParser.DEFAULT_ESCAPE_CHARACTER);
-    }
-
-    /**
-     * Constructs CSVReader with supplied separator and quote char.
-     * 
-     * @param reader
-     *            the reader to an underlying CSV source.
-     * @param separator
-     *            the delimiter to use for separating entries
-     * @param quotechar
-     *            the character to use for quoted elements
-     */
-    public CSVReader(Reader reader, char separator, char quotechar) {
-        this(reader, separator, quotechar, CSVParser.DEFAULT_ESCAPE_CHARACTER, DEFAULT_SKIP_LINES, CSVParser.DEFAULT_STRICT_QUOTES);
-    }
-
-    /**
-     * Constructs CSVReader with supplied separator, quote char and quote handling
-     * behavior.
-     *
-     * @param reader
-     *            the reader to an underlying CSV source.
-     * @param separator
-     *            the delimiter to use for separating entries
-     * @param quotechar
-     *            the character to use for quoted elements
-     * @param strictQuotes
-     *            sets if characters outside the quotes are ignored
-     */
-    public CSVReader(Reader reader, char separator, char quotechar, boolean strictQuotes) {
-        this(reader, separator, quotechar, CSVParser.DEFAULT_ESCAPE_CHARACTER, DEFAULT_SKIP_LINES, strictQuotes);
-    }
-
-   /**
-     * Constructs CSVReader with supplied separator and quote char.
-     *
-     * @param reader
-     *            the reader to an underlying CSV source.
-     * @param separator
-     *            the delimiter to use for separating entries
-     * @param quotechar
-     *            the character to use for quoted elements
-     * @param escape
-     *            the character to use for escaping a separator or quote
-     */
-
-    public CSVReader(Reader reader, char separator,
-			char quotechar, char escape) {
-        this(reader, separator, quotechar, escape, DEFAULT_SKIP_LINES, CSVParser.DEFAULT_STRICT_QUOTES);
-	}
-    
-    /**
-     * Constructs CSVReader with supplied separator and quote char.
-     * 
-     * @param reader
-     *            the reader to an underlying CSV source.
-     * @param separator
-     *            the delimiter to use for separating entries
-     * @param quotechar
-     *            the character to use for quoted elements
-     * @param line
-     *            the line number to skip for start reading 
-     */
-    public CSVReader(Reader reader, char separator, char quotechar, int line) {
-        this(reader, separator, quotechar, CSVParser.DEFAULT_ESCAPE_CHARACTER, line, CSVParser.DEFAULT_STRICT_QUOTES);
-    }
-
-    /**
-     * Constructs CSVReader with supplied separator and quote char.
-     *
-     * @param reader
-     *            the reader to an underlying CSV source.
-     * @param separator
-     *            the delimiter to use for separating entries
-     * @param quotechar
-     *            the character to use for quoted elements
-     * @param escape
-     *            the character to use for escaping a separator or quote
-     * @param line
-     *            the line number to skip for start reading
-     */
-    public CSVReader(Reader reader, char separator, char quotechar, char escape, int line) {
-        this(reader, separator, quotechar, escape, line, CSVParser.DEFAULT_STRICT_QUOTES);
-    }
-    
-    /**
-     * Constructs CSVReader with supplied separator and quote char.
-     * 
-     * @param reader
-     *            the reader to an underlying CSV source.
-     * @param separator
-     *            the delimiter to use for separating entries
-     * @param quotechar
-     *            the character to use for quoted elements
-     * @param escape
-     *            the character to use for escaping a separator or quote
-     * @param line
-     *            the line number to skip for start reading
-     * @param strictQuotes
-     *            sets if characters outside the quotes are ignored
-     */
-    public CSVReader(Reader reader, char separator, char quotechar, char escape, int line, boolean strictQuotes) {
-        this(reader, separator, quotechar, escape, line, strictQuotes, CSVParser.DEFAULT_IGNORE_LEADING_WHITESPACE);
-    }
-
-    /**
-     * Constructs CSVReader with supplied separator and quote char.
-     * 
-     * @param reader
-     *            the reader to an underlying CSV source.
-     * @param separator
-     *            the delimiter to use for separating entries
-     * @param quotechar
-     *            the character to use for quoted elements
-     * @param escape
-     *            the character to use for escaping a separator or quote
-     * @param line
-     *            the line number to skip for start reading
-     * @param strictQuotes
-     *            sets if characters outside the quotes are ignored
-     * @param ignoreLeadingWhiteSpace
-     *            it true, parser should ignore white space before a quote in a field
-     */
-    public CSVReader(Reader reader, char separator, char quotechar, char escape, int line, boolean strictQuotes, boolean ignoreLeadingWhiteSpace) {
-        this.br = new BufferedReader(reader);
-        this.parser = new CSVParser(separator, quotechar, escape, strictQuotes, ignoreLeadingWhiteSpace);
-        this.skipLines = line;
-    }
-
-   /**
-     * Reads the entire file into a List with each element being a String[] of
-     * tokens.
-     * 
-     * @return a List of String[], with each String[] representing a line of the
-     *         file.
-     * 
-     * @throws IOException
-     *             if bad things happen during the read
-     */
-    public List<String[]> readAll() throws IOException {
-
-        List<String[]> allElements = new ArrayList<String[]>();
-        while (hasNext) {
-            String[] nextLineAsTokens = readNext();
-            if (nextLineAsTokens != null)
-                allElements.add(nextLineAsTokens);
-        }
-        return allElements;
-
-    }
-
-    /**
-     * Reads the next line from the buffer and converts to a string array.
-     * 
-     * @return a string array with each comma-separated element as a separate
-     *         entry.
-     * 
-     * @throws IOException
-     *             if bad things happen during the read
-     */
-    public String[] readNext() throws IOException {
-    	
-    	String[] result = null;
-    	do {
-    		String nextLine = getNextLine();
-    		if (!hasNext) {
-    			return result; // should throw if still pending?
-    		}
-    		String[] r = parser.parseLineMulti(nextLine);
-    		if (r.length > 0) {
-    			if (result == null) {
-    				result = r;
-    			} else {
-    				String[] t = new String[result.length+r.length];
-    				System.arraycopy(result, 0, t, 0, result.length);
-    				System.arraycopy(r, 0, t, result.length, r.length);
-    				result = t;
-    			}
-    		}
-    	} while (parser.isPending());
-    	return result;
-    }
-
-    /**
-     * Reads the next line from the file.
-     * 
-     * @return the next line from the file without trailing newline
-     * @throws IOException
-     *             if bad things happen during the read
-     */
-    private String getNextLine() throws IOException {
-    	if (!this.linesSkiped) {
-            for (int i = 0; i < skipLines; i++) {
-                br.readLine();
-            }
-            this.linesSkiped = true;
-        }
-        String nextLine = br.readLine();
-        if (nextLine == null) {
-            hasNext = false;
-        }
-        return hasNext ? nextLine : null;
-    }
-
-    /**
-     * Closes the underlying reader.
-     * 
-     * @throws IOException if the close fails
-     */
-    public void close() throws IOException{
-    	br.close();
-    }
-    
-}
+package au.com.bytecode.opencsv;
+
+/**
+ Copyright 2005 Bytecode Pty Ltd.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+import java.io.BufferedReader;
+import java.io.Closeable;
+import java.io.IOException;
+import java.io.Reader;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A very simple CSV reader released under a commercial-friendly license.
+ * 
+ * @author Glen Smith
+ * 
+ */
+public class CSVReader implements Closeable {
+
+    private BufferedReader br;
+
+    private boolean hasNext = true;
+
+    private CSVParser parser;
+    
+    private int skipLines;
+
+    private boolean linesSkiped;
+
+    /**
+     * The default line to start reading.
+     */
+    public static final int DEFAULT_SKIP_LINES = 0;
+
+    /**
+     * Constructs CSVReader using a comma for the separator.
+     * 
+     * @param reader
+     *            the reader to an underlying CSV source.
+     */
+    public CSVReader(Reader reader) {
+        this(reader, CSVParser.DEFAULT_SEPARATOR, CSVParser.DEFAULT_QUOTE_CHARACTER, CSVParser.DEFAULT_ESCAPE_CHARACTER);
+    }
+
+    /**
+     * Constructs CSVReader with supplied separator.
+     * 
+     * @param reader
+     *            the reader to an underlying CSV source.
+     * @param separator
+     *            the delimiter to use for separating entries.
+     */
+    public CSVReader(Reader reader, char separator) {
+        this(reader, separator, CSVParser.DEFAULT_QUOTE_CHARACTER, CSVParser.DEFAULT_ESCAPE_CHARACTER);
+    }
+
+    /**
+     * Constructs CSVReader with supplied separator and quote char.
+     * 
+     * @param reader
+     *            the reader to an underlying CSV source.
+     * @param separator
+     *            the delimiter to use for separating entries
+     * @param quotechar
+     *            the character to use for quoted elements
+     */
+    public CSVReader(Reader reader, char separator, char quotechar) {
+        this(reader, separator, quotechar, CSVParser.DEFAULT_ESCAPE_CHARACTER, DEFAULT_SKIP_LINES, CSVParser.DEFAULT_STRICT_QUOTES);
+    }
+
+    /**
+     * Constructs CSVReader with supplied separator, quote char and quote handling
+     * behavior.
+     *
+     * @param reader
+     *            the reader to an underlying CSV source.
+     * @param separator
+     *            the delimiter to use for separating entries
+     * @param quotechar
+     *            the character to use for quoted elements
+     * @param strictQuotes
+     *            sets if characters outside the quotes are ignored
+     */
+    public CSVReader(Reader reader, char separator, char quotechar, boolean strictQuotes) {
+        this(reader, separator, quotechar, CSVParser.DEFAULT_ESCAPE_CHARACTER, DEFAULT_SKIP_LINES, strictQuotes);
+    }
+
+   /**
+     * Constructs CSVReader with supplied separator and quote char.
+     *
+     * @param reader
+     *            the reader to an underlying CSV source.
+     * @param separator
+     *            the delimiter to use for separating entries
+     * @param quotechar
+     *            the character to use for quoted elements
+     * @param escape
+     *            the character to use for escaping a separator or quote
+     */
+
+    public CSVReader(Reader reader, char separator,
+			char quotechar, char escape) {
+        this(reader, separator, quotechar, escape, DEFAULT_SKIP_LINES, CSVParser.DEFAULT_STRICT_QUOTES);
+	}
+    
+    /**
+     * Constructs CSVReader with supplied separator and quote char.
+     * 
+     * @param reader
+     *            the reader to an underlying CSV source.
+     * @param separator
+     *            the delimiter to use for separating entries
+     * @param quotechar
+     *            the character to use for quoted elements
+     * @param line
+     *            the line number to skip for start reading 
+     */
+    public CSVReader(Reader reader, char separator, char quotechar, int line) {
+        this(reader, separator, quotechar, CSVParser.DEFAULT_ESCAPE_CHARACTER, line, CSVParser.DEFAULT_STRICT_QUOTES);
+    }
+
+    /**
+     * Constructs CSVReader with supplied separator and quote char.
+     *
+     * @param reader
+     *            the reader to an underlying CSV source.
+     * @param separator
+     *            the delimiter to use for separating entries
+     * @param quotechar
+     *            the character to use for quoted elements
+     * @param escape
+     *            the character to use for escaping a separator or quote
+     * @param line
+     *            the line number to skip for start reading
+     */
+    public CSVReader(Reader reader, char separator, char quotechar, char escape, int line) {
+        this(reader, separator, quotechar, escape, line, CSVParser.DEFAULT_STRICT_QUOTES);
+    }
+    
+    /**
+     * Constructs CSVReader with supplied separator and quote char.
+     * 
+     * @param reader
+     *            the reader to an underlying CSV source.
+     * @param separator
+     *            the delimiter to use for separating entries
+     * @param quotechar
+     *            the character to use for quoted elements
+     * @param escape
+     *            the character to use for escaping a separator or quote
+     * @param line
+     *            the line number to skip for start reading
+     * @param strictQuotes
+     *            sets if characters outside the quotes are ignored
+     */
+    public CSVReader(Reader reader, char separator, char quotechar, char escape, int line, boolean strictQuotes) {
+        this(reader, separator, quotechar, escape, line, strictQuotes, CSVParser.DEFAULT_IGNORE_LEADING_WHITESPACE);
+    }
+
+    /**
+     * Constructs CSVReader with supplied separator and quote char.
+     * 
+     * @param reader
+     *            the reader to an underlying CSV source.
+     * @param separator
+     *            the delimiter to use for separating entries
+     * @param quotechar
+     *            the character to use for quoted elements
+     * @param escape
+     *            the character to use for escaping a separator or quote
+     * @param line
+     *            the line number to skip for start reading
+     * @param strictQuotes
+     *            sets if characters outside the quotes are ignored
+     * @param ignoreLeadingWhiteSpace
+     *            it true, parser should ignore white space before a quote in a field
+     */
+    public CSVReader(Reader reader, char separator, char quotechar, char escape, int line, boolean strictQuotes, boolean ignoreLeadingWhiteSpace) {
+        this.br = new BufferedReader(reader);
+        this.parser = new CSVParser(separator, quotechar, escape, strictQuotes, ignoreLeadingWhiteSpace);
+        this.skipLines = line;
+    }
+
+   /**
+     * Reads the entire file into a List with each element being a String[] of
+     * tokens.
+     * 
+     * @return a List of String[], with each String[] representing a line of the
+     *         file.
+     * 
+     * @throws IOException
+     *             if bad things happen during the read
+     */
+    public List<String[]> readAll() throws IOException {
+
+        List<String[]> allElements = new ArrayList<String[]>();
+        while (hasNext) {
+            String[] nextLineAsTokens = readNext();
+            if (nextLineAsTokens != null)
+                allElements.add(nextLineAsTokens);
+        }
+        return allElements;
+
+    }
+
+    /**
+     * Reads the next line from the buffer and converts to a string array.
+     * 
+     * @return a string array with each comma-separated element as a separate
+     *         entry.
+     * 
+     * @throws IOException
+     *             if bad things happen during the read
+     */
+    public String[] readNext() throws IOException {
+    	
+    	String[] result = null;
+    	do {
+    		String nextLine = getNextLine();
+    		if (!hasNext) {
+    			return result; // should throw if still pending?
+    		}
+    		String[] r = parser.parseLineMulti(nextLine);
+    		if (r.length > 0) {
+    			if (result == null) {
+    				result = r;
+    			} else {
+    				String[] t = new String[result.length+r.length];
+    				System.arraycopy(result, 0, t, 0, result.length);
+    				System.arraycopy(r, 0, t, result.length, r.length);
+    				result = t;
+    			}
+    		}
+    	} while (parser.isPending());
+    	return result;
+    }
+
+    /**
+     * Reads the next line from the file.
+     * 
+     * @return the next line from the file without trailing newline
+     * @throws IOException
+     *             if bad things happen during the read
+     */
+    private String getNextLine() throws IOException {
+    	if (!this.linesSkiped) {
+            for (int i = 0; i < skipLines; i++) {
+                br.readLine();
+            }
+            this.linesSkiped = true;
+        }
+        String nextLine = br.readLine();
+        if (nextLine == null) {
+            hasNext = false;
+        }
+        return hasNext ? nextLine : null;
+    }
+
+    /**
+     * Closes the underlying reader.
+     * 
+     * @throws IOException if the close fails
+     */
+    public void close() throws IOException{
+    	br.close();
+    }
+    
+}

au/com/bytecode/opencsv/CSVWriter.java

@@ -1,302 +1,302 @@
-package au.com.bytecode.opencsv;
-
-/**
- Copyright 2005 Bytecode Pty Ltd.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-import java.io.Closeable;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.Writer;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.List;
-
-/**
- * A very simple CSV writer released under a commercial-friendly license.
- *
- * @author Glen Smith
- *
- */
-public class CSVWriter implements Closeable {
-    
-    public static final int INITIAL_STRING_SIZE = 128;
-
-	private Writer rawWriter;
-
-    private PrintWriter pw;
-
-    private char separator;
-
-    private char quotechar;
-    
-    private char escapechar;
-    
-    private String lineEnd;
-
-    /** The character used for escaping quotes. */
-    public static final char DEFAULT_ESCAPE_CHARACTER = '"';
-
-    /** The default separator to use if none is supplied to the constructor. */
-    public static final char DEFAULT_SEPARATOR = ',';
-
-    /**
-     * The default quote character to use if none is supplied to the
-     * constructor.
-     */
-    public static final char DEFAULT_QUOTE_CHARACTER = '"';
-    
-    /** The quote constant to use when you wish to suppress all quoting. */
-    public static final char NO_QUOTE_CHARACTER = '\u0000';
-    
-    /** The escape constant to use when you wish to suppress all escaping. */
-    public static final char NO_ESCAPE_CHARACTER = '\u0000';
-    
-    /** Default line terminator uses platform encoding. */
-    public static final String DEFAULT_LINE_END = "\n";
-
-    private ResultSetHelper resultService = new ResultSetHelperService();
-    
-    /**
-     * Constructs CSVWriter using a comma for the separator.
-     *
-     * @param writer
-     *            the writer to an underlying CSV source.
-     */
-    public CSVWriter(Writer writer) {
-        this(writer, DEFAULT_SEPARATOR);
-    }
-
-    /**
-     * Constructs CSVWriter with supplied separator.
-     *
-     * @param writer
-     *            the writer to an underlying CSV source.
-     * @param separator
-     *            the delimiter to use for separating entries.
-     */
-    public CSVWriter(Writer writer, char separator) {
-        this(writer, separator, DEFAULT_QUOTE_CHARACTER);
-    }
-
-    /**
-     * Constructs CSVWriter with supplied separator and quote char.
-     *
-     * @param writer
-     *            the writer to an underlying CSV source.
-     * @param separator
-     *            the delimiter to use for separating entries
-     * @param quotechar
-     *            the character to use for quoted elements
-     */
-    public CSVWriter(Writer writer, char separator, char quotechar) {
-    	this(writer, separator, quotechar, DEFAULT_ESCAPE_CHARACTER);
-    }
-
-    /**
-     * Constructs CSVWriter with supplied separator and quote char.
-     *
-     * @param writer
-     *            the writer to an underlying CSV source.
-     * @param separator
-     *            the delimiter to use for separating entries
-     * @param quotechar
-     *            the character to use for quoted elements
-     * @param escapechar
-     *            the character to use for escaping quotechars or escapechars
-     */
-    public CSVWriter(Writer writer, char separator, char quotechar, char escapechar) {
-        this(writer, separator, quotechar, escapechar, DEFAULT_LINE_END);
-    }
-    
-    
-    /**
-     * Constructs CSVWriter with supplied separator and quote char.
-     *
-     * @param writer
-     *            the writer to an underlying CSV source.
-     * @param separator
-     *            the delimiter to use for separating entries
-     * @param quotechar
-     *            the character to use for quoted elements
-     * @param lineEnd
-     * 			  the line feed terminator to use
-     */
-    public CSVWriter(Writer writer, char separator, char quotechar, String lineEnd) {
-        this(writer, separator, quotechar, DEFAULT_ESCAPE_CHARACTER, lineEnd);
-    }   
-    
-    
-    
-    /**
-     * Constructs CSVWriter with supplied separator, quote char, escape char and line ending.
-     *
-     * @param writer
-     *            the writer to an underlying CSV source.
-     * @param separator
-     *            the delimiter to use for separating entries
-     * @param quotechar
-     *            the character to use for quoted elements
-     * @param escapechar
-     *            the character to use for escaping quotechars or escapechars
-     * @param lineEnd
-     * 			  the line feed terminator to use
-     */
-    public CSVWriter(Writer writer, char separator, char quotechar, char escapechar, String lineEnd) {
-        this.rawWriter = writer;
-        this.pw = new PrintWriter(writer);
-        this.separator = separator;
-        this.quotechar = quotechar;
-        this.escapechar = escapechar;
-        this.lineEnd = lineEnd;
-    }
-    
-    /**
-     * Writes the entire list to a CSV file. The list is assumed to be a
-     * String[]
-     *
-     * @param allLines
-     *            a List of String[], with each String[] representing a line of
-     *            the file.
-     */
-    public void writeAll(List<String[]> allLines)  {
-    	for (String[] line : allLines) {
-			writeNext(line);
-		}
-    }
-
-    protected void writeColumnNames(ResultSet rs)
-    	throws SQLException {
-
-    	writeNext(resultService.getColumnNames(rs));
-    }
-    
-    /**
-     * Writes the entire ResultSet to a CSV file.
-     *
-     * The caller is responsible for closing the ResultSet.
-     *
-     * @param rs the recordset to write
-     * @param includeColumnNames true if you want column names in the output, false otherwise
-     *
-     * @throws java.io.IOException thrown by getColumnValue
-     * @throws java.sql.SQLException thrown by getColumnValue
-     */
-    public void writeAll(java.sql.ResultSet rs, boolean includeColumnNames)  throws SQLException, IOException {
-    	
-    	
-    	if (includeColumnNames) {
-			writeColumnNames(rs);
-		}
-    	
-    	while (rs.next())
-    	{
-    		writeNext(resultService.getColumnValues(rs));
-    	}
-    }
-
-    
-    /**
-     * Writes the next line to the file.
-     *
-     * @param nextLine
-     *            a string array with each comma-separated element as a separate
-     *            entry.
-     */
-    public void writeNext(String[] nextLine) {
-    	
-    	if (nextLine == null)
-    		return;
-    	
-        StringBuilder sb = new StringBuilder(INITIAL_STRING_SIZE);
-        for (int i = 0; i < nextLine.length; i++) {
-
-            if (i != 0) {
-                sb.append(separator);
-            }
-
-            String nextElement = nextLine[i];
-            if (nextElement == null)
-                continue;
-            if (quotechar !=  NO_QUOTE_CHARACTER)
-            	sb.append(quotechar);
-            
-            sb.append(stringContainsSpecialCharacters(nextElement) ? processLine(nextElement) : nextElement);
-
-            if (quotechar != NO_QUOTE_CHARACTER)
-            	sb.append(quotechar);
-        }
-        
-        sb.append(lineEnd);
-        pw.write(sb.toString());
-
-    }
-
-	private boolean stringContainsSpecialCharacters(String line) {
-	    return line.indexOf(quotechar) != -1 || line.indexOf(escapechar) != -1;
-    }
-
-	protected StringBuilder processLine(String nextElement)
-    {
-		StringBuilder sb = new StringBuilder(INITIAL_STRING_SIZE);
-	    for (int j = 0; j < nextElement.length(); j++) {
-	        char nextChar = nextElement.charAt(j);
-	        if (escapechar != NO_ESCAPE_CHARACTER && nextChar == quotechar) {
-	        	sb.append(escapechar).append(nextChar);
-	        } else if (escapechar != NO_ESCAPE_CHARACTER && nextChar == escapechar) {
-	        	sb.append(escapechar).append(nextChar);
-	        } else {
-	            sb.append(nextChar);
-	        }
-	    }
-	    
-	    return sb;
-    }
-
-    /**
-     * Flush underlying stream to writer.
-     * 
-     * @throws IOException if bad things happen
-     */
-    public void flush() throws IOException {
-
-        pw.flush();
-
-    } 
-
-    /**
-     * Close the underlying stream writer flushing any buffered content.
-     *
-     * @throws IOException if bad things happen
-     *
-     */
-    public void close() throws IOException {
-        flush();
-        pw.close();
-        rawWriter.close();
-    }
-
-    /**
-     *  Checks to see if the there has been an error in the printstream. 
-     */
-    public boolean checkError() {
-        return pw.checkError();
-    }
-
-    public void setResultService(ResultSetHelper resultService) {
-        this.resultService = resultService;
-    }
-
-}
+package au.com.bytecode.opencsv;
+
+/**
+ Copyright 2005 Bytecode Pty Ltd.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.Writer;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.List;
+
+/**
+ * A very simple CSV writer released under a commercial-friendly license.
+ *
+ * @author Glen Smith
+ *
+ */
+public class CSVWriter implements Closeable {
+    
+    public static final int INITIAL_STRING_SIZE = 128;
+
+	private Writer rawWriter;
+
+    private PrintWriter pw;
+
+    private char separator;
+
+    private char quotechar;
+    
+    private char escapechar;
+    
+    private String lineEnd;
+
+    /** The character used for escaping quotes. */
+    public static final char DEFAULT_ESCAPE_CHARACTER = '"';
+
+    /** The default separator to use if none is supplied to the constructor. */
+    public static final char DEFAULT_SEPARATOR = ',';
+
+    /**
+     * The default quote character to use if none is supplied to the
+     * constructor.
+     */
+    public static final char DEFAULT_QUOTE_CHARACTER = '"';
+    
+    /** The quote constant to use when you wish to suppress all quoting. */
+    public static final char NO_QUOTE_CHARACTER = '\u0000';
+    
+    /** The escape constant to use when you wish to suppress all escaping. */
+    public static final char NO_ESCAPE_CHARACTER = '\u0000';
+    
+    /** Default line terminator uses platform encoding. */
+    public static final String DEFAULT_LINE_END = "\n";
+
+    private ResultSetHelper resultService = new ResultSetHelperService();
+    
+    /**
+     * Constructs CSVWriter using a comma for the separator.
+     *
+     * @param writer
+     *            the writer to an underlying CSV source.
+     */
+    public CSVWriter(Writer writer) {
+        this(writer, DEFAULT_SEPARATOR);
+    }
+
+    /**
+     * Constructs CSVWriter with supplied separator.
+     *
+     * @param writer
+     *            the writer to an underlying CSV source.
+     * @param separator
+     *            the delimiter to use for separating entries.
+     */
+    public CSVWriter(Writer writer, char separator) {
+        this(writer, separator, DEFAULT_QUOTE_CHARACTER);
+    }
+
+    /**
+     * Constructs CSVWriter with supplied separator and quote char.
+     *
+     * @param writer
+     *            the writer to an underlying CSV source.
+     * @param separator
+     *            the delimiter to use for separating entries
+     * @param quotechar
+     *            the character to use for quoted elements
+     */
+    public CSVWriter(Writer writer, char separator, char quotechar) {
+    	this(writer, separator, quotechar, DEFAULT_ESCAPE_CHARACTER);
+    }
+
+    /**
+     * Constructs CSVWriter with supplied separator and quote char.
+     *
+     * @param writer
+     *            the writer to an underlying CSV source.
+     * @param separator
+     *            the delimiter to use for separating entries
+     * @param quotechar
+     *            the character to use for quoted elements
+     * @param escapechar
+     *            the character to use for escaping quotechars or escapechars
+     */
+    public CSVWriter(Writer writer, char separator, char quotechar, char escapechar) {
+        this(writer, separator, quotechar, escapechar, DEFAULT_LINE_END);
+    }
+    
+    
+    /**
+     * Constructs CSVWriter with supplied separator and quote char.
+     *
+     * @param writer
+     *            the writer to an underlying CSV source.
+     * @param separator
+     *            the delimiter to use for separating entries
+     * @param quotechar
+     *            the character to use for quoted elements
+     * @param lineEnd
+     * 			  the line feed terminator to use
+     */
+    public CSVWriter(Writer writer, char separator, char quotechar, String lineEnd) {
+        this(writer, separator, quotechar, DEFAULT_ESCAPE_CHARACTER, lineEnd);
+    }   
+    
+    
+    
+    /**
+     * Constructs CSVWriter with supplied separator, quote char, escape char and line ending.
+     *
+     * @param writer
+     *            the writer to an underlying CSV source.
+     * @param separator
+     *            the delimiter to use for separating entries
+     * @param quotechar
+     *            the character to use for quoted elements
+     * @param escapechar
+     *            the character to use for escaping quotechars or escapechars
+     * @param lineEnd
+     * 			  the line feed terminator to use
+     */
+    public CSVWriter(Writer writer, char separator, char quotechar, char escapechar, String lineEnd) {
+        this.rawWriter = writer;
+        this.pw = new PrintWriter(writer);
+        this.separator = separator;
+        this.quotechar = quotechar;
+        this.escapechar = escapechar;
+        this.lineEnd = lineEnd;
+    }
+    
+    /**
+     * Writes the entire list to a CSV file. The list is assumed to be a
+     * String[]
+     *
+     * @param allLines
+     *            a List of String[], with each String[] representing a line of
+     *            the file.
+     */
+    public void writeAll(List<String[]> allLines)  {
+    	for (String[] line : allLines) {
+			writeNext(line);
+		}
+    }
+
+    protected void writeColumnNames(ResultSet rs)
+    	throws SQLException {
+
+    	writeNext(resultService.getColumnNames(rs));
+    }
+    
+    /**
+     * Writes the entire ResultSet to a CSV file.
+     *
+     * The caller is responsible for closing the ResultSet.
+     *
+     * @param rs the recordset to write
+     * @param includeColumnNames true if you want column names in the output, false otherwise
+     *
+     * @throws java.io.IOException thrown by getColumnValue
+     * @throws java.sql.SQLException thrown by getColumnValue
+     */
+    public void writeAll(java.sql.ResultSet rs, boolean includeColumnNames)  throws SQLException, IOException {
+    	
+    	
+    	if (includeColumnNames) {
+			writeColumnNames(rs);
+		}
+    	
+    	while (rs.next())
+    	{
+    		writeNext(resultService.getColumnValues(rs));
+    	}
+    }
+
+    
+    /**
+     * Writes the next line to the file.
+     *
+     * @param nextLine
+     *            a string array with each comma-separated element as a separate
+     *            entry.
+     */
+    public void writeNext(String[] nextLine) {
+    	
+    	if (nextLine == null)
+    		return;
+    	
+        StringBuilder sb = new StringBuilder(INITIAL_STRING_SIZE);
+        for (int i = 0; i < nextLine.length; i++) {
+
+            if (i != 0) {
+                sb.append(separator);
+            }
+
+            String nextElement = nextLine[i];
+            if (nextElement == null)
+                continue;
+            if (quotechar !=  NO_QUOTE_CHARACTER)
+            	sb.append(quotechar);
+            
+            sb.append(stringContainsSpecialCharacters(nextElement) ? processLine(nextElement) : nextElement);
+
+            if (quotechar != NO_QUOTE_CHARACTER)
+            	sb.append(quotechar);
+        }
+        
+        sb.append(lineEnd);
+        pw.write(sb.toString());
+
+    }
+
+	private boolean stringContainsSpecialCharacters(String line) {
+	    return line.indexOf(quotechar) != -1 || line.indexOf(escapechar) != -1;
+    }
+
+	protected StringBuilder processLine(String nextElement)
+    {
+		StringBuilder sb = new StringBuilder(INITIAL_STRING_SIZE);
+	    for (int j = 0; j < nextElement.length(); j++) {
+	        char nextChar = nextElement.charAt(j);
+	        if (escapechar != NO_ESCAPE_CHARACTER && nextChar == quotechar) {
+	        	sb.append(escapechar).append(nextChar);
+	        } else if (escapechar != NO_ESCAPE_CHARACTER && nextChar == escapechar) {
+	        	sb.append(escapechar).append(nextChar);
+	        } else {
+	            sb.append(nextChar);
+	        }
+	    }
+	    
+	    return sb;
+    }
+
+    /**
+     * Flush underlying stream to writer.
+     * 
+     * @throws IOException if bad things happen
+     */
+    public void flush() throws IOException {
+
+        pw.flush();
+
+    } 
+
+    /**
+     * Close the underlying stream writer flushing any buffered content.
+     *
+     * @throws IOException if bad things happen
+     *
+     */
+    public void close() throws IOException {
+        flush();
+        pw.close();
+        rawWriter.close();
+    }
+
+    /**
+     *  Checks to see if the there has been an error in the printstream. 
+     */
+    public boolean checkError() {
+        return pw.checkError();
+    }
+
+    public void setResultService(ResultSetHelper resultService) {
+        this.resultService = resultService;
+    }
+
+}

au/com/bytecode/opencsv/bean/package.html

@@ -1,12 +1,12 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-</head>
-<body bgcolor="white">
-<p>
-A simple bean binding interface for use with opencsv.
-</p>
-<br>
-<a href="http://opencsv.sourceforge.net/">opencsv.sourceforge.net</a>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+</head>
+<body bgcolor="white">
+<p>
+A simple bean binding interface for use with opencsv.
+</p>
+<br>
+<a href="http://opencsv.sourceforge.net/">opencsv.sourceforge.net</a>
+</body>
+</html>

au/com/bytecode/opencsv/package.html

@@ -1,12 +1,12 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-</head>
-<body bgcolor="white">
-<p>
-A very simple CSV parser for Java released under a commercial-friendly license.
-</p>
-<br>
-<a href="http://opencsv.sourceforge.net/">opencsv.sourceforge.net</a>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+</head>
+<body bgcolor="white">
+<p>
+A very simple CSV parser for Java released under a commercial-friendly license.
+</p>
+<br>
+<a href="http://opencsv.sourceforge.net/">opencsv.sourceforge.net</a>
+</body>
+</html>

build.gradle

@@ -1,135 +0,0 @@
-buildscript {
-    repositories {
-        mavenCentral()
-        maven {
-            name = "forge"
-            url = "http://files.minecraftforge.net/maven"
-        }
-        maven {
-            name = "sonatype"
-            url = "https://oss.sonatype.org/content/repositories/snapshots/"
-        }
-    }
-    dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
-    }
-}
-
-configurations {
-    deployerJars
-}
-
-//add dependency repositories
-repositories {
-	mavenLocal()
-    mavenCentral()
-    maven {
-        name = "chickenbones"
-        url = "http://chickenbones.net/maven/"
-    }
-}
-
-apply plugin: 'java'
-apply plugin: 'forge'
-apply plugin: 'maven'
-
-version = "1.5.2a"
-group= "mcp.mobius.waila" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
-archivesBaseName = "Waila"
-
-// Define properties file
-ext.configFile = file "build.properties"
-
-configFile.withReader {
-    // Load config. It shall from now be referenced as simply config or project.config
-    def prop = new Properties()
-    prop.load(it)
-    project.ext.config = new ConfigSlurper().parse prop
-}
-
-dependencies {
-    compile "codechicken:CodeChickenLib:${config.mc_version}-${config.ccl_version}:dev"
-    compile "codechicken:CodeChickenCore:${config.mc_version}-${config.ccc_version}:dev"
-    compile "codechicken:NotEnoughItems:${config.mc_version}-${config.nei_version}:dev"
-    deployerJars "org.apache.maven.wagon:wagon-ssh:2.2"
-}
-
-minecraft {
-    version = "1.7.10-10.13.0.1160"
-    assetDir = "eclipse/assets"
-}
-
-def root = project.projectDir.parentFile
-sourceSets {
-    main {
-        java {
-            srcDir new File(root, "src")
-        }
-        resources {
-            srcDir new File(root, "resources")
-        }
-    }
-}
-
-processResources
-{
-    // this will ensure that this task is redone when the versions change.
-    inputs.property "version", project.version
-    inputs.property "mcversion", project.minecraft.version
-
-    // replace stuff in mcmod.info, nothing else
-    from(sourceSets.main.resources.srcDirs) {
-        include 'mcmod.info'
-                
-        // replace version and mcversion
-        expand 'version':project.version, 'mcversion':project.minecraft.version
-    }
-        
-    // copy everything else, thats not the mcmod.info
-    from(sourceSets.main.resources.srcDirs) {
-        exclude 'mcmod.info'
-    }
-}
-
-jar { 
-exclude "**/client/gui/inventory/GuiContainer.class" 
-exclude "**/client/gui/inventory/GuiContainer.java" 
-}
-
-task sourceJar(type: Jar) {
-    from sourceSets.main.java
-    from new File(root, "dev")
-    classifier = 'sources'
-}
-
-task devJar(type: Jar) {
-    from sourceSets.main.output
-    classifier = 'dev'
-}
-
-artifacts {
-    archives sourceJar, devJar
-}
-
-uploadArchives {
-	dependsOn 'reobf'
-    repositories.mavenDeployer {
-        configuration = configurations.deployerJars
-        repository(url: "scp://mobiusstrip.eu/home/mobius/web/maven"){
-            authentication(userName: "mobius")
-        }
-
-        pom {
-            groupId = project.group
-            version = project.version
-            artifactId = project.archivesBaseName
-            project {
-                name project.archivesBaseName
-                packaging 'jar'
-                description 'Waila '
-                url 'http://mobiusstrip.eu'        
-            }
-        }
-    }
-
-}

build.properties

@@ -1,7 +0,0 @@
-mc_version=1.7.10
-forge_version=10.13.0.1160
-ccl_version=1.1.1.93
-ccc_version=1.0.1.8
-nei_version=1.0.2.15
-mod_version=1.0
-waila_version=1.5.2a

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +0,0 @@
-#Tue May 06 21:57:37 CEST 2014
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-1.12-bin.zip

gradlew

@@ -1,164 +0,0 @@
-#!/usr/bin/env bash
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
-
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

gradlew.bat

@@ -1,90 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega

mcp/mobius/waila/Waila.java

@@ -10,19 +10,20 @@ import com.google.common.eventbus.Subscribe;
 import mcp.mobius.waila.api.IWailaRegistrar;
 import mcp.mobius.waila.api.impl.ConfigHandler;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
-import mcp.mobius.waila.network.NetworkHandler;
+import mcp.mobius.waila.network.WailaConnectionHandler;
 import mcp.mobius.waila.network.WailaPacketHandler;
 import mcp.mobius.waila.overlay.OverlayConfig;
 import mcp.mobius.waila.overlay.DecoratorRenderer;
-import mcp.mobius.waila.overlay.WailaTickHandler;
 import mcp.mobius.waila.server.ProxyServer;
 import mcp.mobius.waila.utils.Constants;
 import mcp.mobius.waila.utils.ModIdentification;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.config.Configuration;
+import net.minecraft.src.ModLoader;
+import net.minecraftforge.common.Configuration;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.oredict.OreDictionary;
+import codechicken.lib.lang.LangUtil;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.FMLModContainer;
 import cpw.mods.fml.common.Mod;
@@ -35,17 +36,13 @@ import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage;
 import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import cpw.mods.fml.common.network.NetworkMod;
 import cpw.mods.fml.common.registry.LanguageRegistry;
-import cpw.mods.fml.relauncher.Side;
-import mcp.mobius.waila.cbcore.LangUtil;
-import mcp.mobius.waila.client.KeyEvent;
 
-@Mod(modid="Waila", name="Waila", version="1.5.2_1.7.2", dependencies="required-after:NotEnoughItems")
-/*
+@Mod(modid="Waila", name="Waila", version="1.5.2", dependencies="required-after:NotEnoughItems")
 @NetworkMod(channels = {"Waila"},clientSideRequired=false, serverSideRequired=false, connectionHandler = WailaConnectionHandler.class, 
 			packetHandler = WailaPacketHandler.class, versionBounds="[1.5.0,)")
 			//packetHandler = WailaPacketHandler.class)
-*/
 
 public class Waila {
     // The instance of your mod that Forge uses.
@@ -73,13 +70,6 @@ public class Waila {
             EventBus FMLbus = (EventBus) eBus.get(FMLCommonHandler.instance().findContainerFor(this));
             FMLbus.register(this);
         } catch (Throwable t) {}
-        
-        if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT){
-        	MinecraftForge.EVENT_BUS.register(new DecoratorRenderer());
-    		FMLCommonHandler.instance().bus().register(new KeyEvent());
-    		FMLCommonHandler.instance().bus().register(WailaTickHandler.instance());        	
-        }
-		FMLCommonHandler.instance().bus().register(new NetworkHandler());        
 	}
 
     @EventHandler
@@ -87,8 +77,7 @@ public class Waila {
 		proxy.registerHandlers();
     	ModIdentification.init();
         
-    	/*
-        if (ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_KEYBIND, true)){
+        if (!ModLoader.isModLoaded("nek") && ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_KEYBIND, true)){
         
 	        for (String key: ModIdentification.keyhandlerStrings.keySet()){
 	        	String orig  = I18n.getString(key);
@@ -120,7 +109,6 @@ public class Waila {
 	        	LanguageRegistry.instance().addStringLocalization(key, modif);
 	        }
         }
-        */
         
 	}
 

mcp/mobius/waila/addons/agriculture/HUDHandlerCrop.java

@@ -2,7 +2,7 @@ package mcp.mobius.waila.addons.agriculture;
 
 import java.util.List;
 
-import mcp.mobius.waila.cbcore.LangUtil;
+import codechicken.lib.lang.LangUtil;
 import net.minecraft.item.ItemStack;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;

mcp/mobius/waila/addons/appeng/AppEngModule.java

@@ -4,6 +4,8 @@ import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.logging.Level;
 
+import codechicken.lib.lang.LangUtil;
+import net.minecraftforge.common.ForgeDirection;
 import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
 

mcp/mobius/waila/addons/appeng/HUDAppEngMonitor.java

@@ -3,12 +3,12 @@ package mcp.mobius.waila.addons.appeng;
 import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 
+import codechicken.lib.lang.LangUtil;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
-import mcp.mobius.waila.cbcore.LangUtil;
 
 public class HUDAppEngMonitor implements IWailaDataProvider {
 

mcp/mobius/waila/addons/betterbarrels/BetterBarrelsModule.java

@@ -6,6 +6,7 @@ import java.util.logging.Level;
 
 import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
+import codechicken.lib.lang.LangUtil;
 import codechicken.nei.api.API;
 import codechicken.nei.api.ItemInfo;
 

mcp/mobius/waila/addons/betterbarrels/HUDHandlerBBContent.java

@@ -15,7 +15,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.World;
-import mcp.mobius.waila.cbcore.LangUtil;
+import codechicken.lib.lang.LangUtil;
 import codechicken.nei.api.API;
 import codechicken.nei.api.ItemInfo;
 import codechicken.nei.api.ItemInfo.Layout;

mcp/mobius/waila/addons/buildcraft/BCModule.java

@@ -3,9 +3,9 @@ package mcp.mobius.waila.addons.buildcraft;
 import java.lang.reflect.Method;
 import java.util.logging.Level;
 
-import net.minecraftforge.common.util.ForgeDirection;
 import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
+import net.minecraftforge.common.ForgeDirection;
 
 public class BCModule {
 

mcp/mobius/waila/addons/buildcraft/BCPowerAPIModule.java

@@ -4,7 +4,7 @@ import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.logging.Level;
 
-import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.common.ForgeDirection;
 import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
 

mcp/mobius/waila/addons/buildcraft/HUDHandlerBCTanks.java

@@ -5,17 +5,25 @@ import java.util.logging.Level;
 
 //import buildcraft.factory.TileTank;
 
+
+
+
+
+
+
+import codechicken.lib.lang.LangUtil;
 import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
 import mcp.mobius.waila.api.impl.ConfigHandler;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.common.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTankInfo;
 import net.minecraftforge.fluids.IFluidHandler;
-import mcp.mobius.waila.cbcore.LangUtil;
+import net.minecraftforge.liquids.ILiquidTank;
+import net.minecraftforge.liquids.LiquidStack;
 
 public class HUDHandlerBCTanks implements IWailaDataProvider {
 

mcp/mobius/waila/addons/buildcraft/HUDHandlerIPowerReceptor.java

@@ -2,12 +2,12 @@ package mcp.mobius.waila.addons.buildcraft;
 
 import java.util.List;
 
+import codechicken.lib.lang.LangUtil;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.common.ForgeDirection;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
-import mcp.mobius.waila.cbcore.LangUtil;
 import mcp.mobius.waila.utils.WailaExceptionHandler;
 
 public class HUDHandlerIPowerReceptor implements IWailaDataProvider {

mcp/mobius/waila/addons/carpenters/CarpentersModule.java

@@ -12,7 +12,6 @@ public class CarpentersModule {
 	public static Class BlockCarpentersHatch = null;
 	
 	public static void register(){
-		/*
 		try{
 			Class CarpentersBlocks = Class.forName("carpentersblocks.CarpentersBlocks");
 			Waila.log.log(Level.INFO, "CarpentersBlocks mod found.");
@@ -39,7 +38,6 @@ public class CarpentersModule {
 		ModuleRegistrar.instance().registerStackProvider(new HUDCarpentersBlocksTE(), BlockCarpentersHatch);
 		ModuleRegistrar.instance().registerSyncedNBTKey("data",    TEBase);
 		ModuleRegistrar.instance().registerSyncedNBTKey("cover_6", TEBase);
-		*/
 	}	
 	
 }

mcp/mobius/waila/addons/carpenters/HUDCarpentersBlocksTE.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.common.ForgeDirection;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
@@ -12,7 +13,6 @@ public class HUDCarpentersBlocksTE implements IWailaDataProvider {
 
 	@Override
 	public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		/*
 		if (!config.getConfig("carpenters.hide")) return null;
 
 		NBTTagCompound tag  = accessor.getNBTData();
@@ -34,7 +34,7 @@ public class HUDCarpentersBlocksTE implements IWailaDataProvider {
 			
 			return new ItemStack(cover & 0xfff, 0, (cover & 0xf000) >>> 12);			
 		}
-		*/
+		
 		return null;
 	}
 

mcp/mobius/waila/addons/enderio/EnderIOModule.java

@@ -4,6 +4,7 @@ import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.logging.Level;
 
+import net.minecraftforge.common.ForgeDirection;
 import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
 

mcp/mobius/waila/addons/enderio/HUDHandlerCapacitor.java

@@ -2,7 +2,7 @@ package mcp.mobius.waila.addons.enderio;
 
 import java.util.List;
 
-import mcp.mobius.waila.cbcore.LangUtil;
+import codechicken.lib.lang.LangUtil;
 import net.minecraft.item.ItemStack;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;

mcp/mobius/waila/addons/enderio/HUDHandlerTesseract.java

@@ -2,7 +2,7 @@ package mcp.mobius.waila.addons.enderio;
 
 import java.util.List;
 
-import mcp.mobius.waila.cbcore.LangUtil;
+import codechicken.lib.lang.LangUtil;
 import net.minecraft.item.ItemStack;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;

mcp/mobius/waila/addons/enderstorage/HUDHandlerStorage.java

@@ -2,7 +2,7 @@ package mcp.mobius.waila.addons.enderstorage;
 
 import java.util.List;
 
-import mcp.mobius.waila.cbcore.LangUtil;
+import codechicken.lib.lang.LangUtil;
 import net.minecraft.item.ItemStack;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;

mcp/mobius/waila/addons/etb/HUDHandlerSocket.java

@@ -5,7 +5,7 @@ import java.util.List;
 
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.common.ForgeDirection;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;

mcp/mobius/waila/addons/exu/HUDHandlerDrum.java

@@ -4,7 +4,7 @@ import java.util.List;
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.common.ForgeDirection;
 import net.minecraftforge.fluids.FluidTankInfo;
 import net.minecraftforge.fluids.IFluidHandler;
 import mcp.mobius.waila.api.IWailaConfigHandler;

mcp/mobius/waila/addons/harvestcraft/HUDHandlerPamCrop.java

@@ -2,7 +2,7 @@ package mcp.mobius.waila.addons.harvestcraft;
 
 import java.util.List;
 
-import mcp.mobius.waila.cbcore.LangUtil;
+import codechicken.lib.lang.LangUtil;
 import net.minecraft.item.ItemStack;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;

mcp/mobius/waila/addons/ic2/HUDHandlerTEBaseGenerator.java

@@ -2,7 +2,7 @@ package mcp.mobius.waila.addons.ic2;
 
 import java.util.List;
 
-import mcp.mobius.waila.cbcore.LangUtil;
+import codechicken.lib.lang.LangUtil;
 import net.minecraft.item.ItemStack;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;

mcp/mobius/waila/addons/ic2/HUDHandlerTEElectricBlock.java

@@ -2,7 +2,7 @@ package mcp.mobius.waila.addons.ic2;
 
 import java.util.List;
 
-import mcp.mobius.waila.cbcore.LangUtil;
+import codechicken.lib.lang.LangUtil;
 import net.minecraft.item.ItemStack;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;

mcp/mobius/waila/addons/ic2/HUDHandlerTEStandardMachine.java

@@ -2,7 +2,7 @@ package mcp.mobius.waila.addons.ic2;
 
 import java.util.List;
 
-import mcp.mobius.waila.cbcore.LangUtil;
+import codechicken.lib.lang.LangUtil;
 import net.minecraft.item.ItemStack;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;

mcp/mobius/waila/addons/ic2/HUDHandlerTETradeOMat.java

@@ -2,7 +2,7 @@ package mcp.mobius.waila.addons.ic2;
 
 import java.util.List;
 
-import mcp.mobius.waila.cbcore.LangUtil;
+import codechicken.lib.lang.LangUtil;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
@@ -26,7 +26,7 @@ public class HUDHandlerTETradeOMat implements IWailaDataProvider {
 
 	@Override
 	public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		/*
+		
 		if (!ConfigHandler.instance().getConfig("ic2.tradeomat")) return currenttip;
 		
 		NBTTagCompound slots = accessor.getNBTData().getCompoundTag("InvSlots");
@@ -47,7 +47,7 @@ public class HUDHandlerTETradeOMat implements IWailaDataProvider {
 			ItemStack is = new ItemStack(subtag.getShort("id"), subtag.getByte("Count"), subtag.getShort("Damage"));
 			currenttip.add(String.format("%s%s\u00a7f%d\u00a7r x \u00a7f%s\u00a7r", demandsStr, TAB + ALIGNRIGHT, is.stackSize, is.getDisplayName()));
 		}		
-		*/
+		
 		return currenttip;
 	}
 

mcp/mobius/waila/addons/ic2/IC2Module.java

@@ -54,7 +54,7 @@ public class IC2Module {
 	public static ItemStack OverclockerUpgradeStack   = null;
 	
 	public static void register(){
-	/*
+
 		
 		try{
 			TileEntityStandardMachine = Class.forName("ic2.core.block.machine.tileentity.TileEntityStandardMachine");
@@ -133,19 +133,16 @@ public class IC2Module {
 		ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityGeoGenerator);
 		ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityElectricBlock);
 		ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityTradeOMat);
-		*/
 	}
 
 	/* Retuns the current stored energy if available in the nbt and config is true */
 	public static double getStoredEnergy(IWailaDataAccessor accessor){
-		/*
 		if (ConfigHandler.instance().getConfig("ic2.storage")){
 			if (accessor.getNBTData().hasKey("energy"))
 				return accessor.getNBTData().getDouble("energy");
 			else if (accessor.getNBTData().hasKey("storage"))
 				return accessor.getNBTData().getDouble("storage");
 		}
-		*/
 		return -1.0;
 	}
 	
@@ -153,8 +150,7 @@ public class IC2Module {
 		
 		NBTTagCompound nbt   = accessor.getNBTData();
 		IC2Upgrades upgrades = new IC2Upgrades();
-
-		/*
+		
 		if (!nbt.hasKey("InvSlots")) return null;
 		
 		NBTTagCompound inventory = nbt.getCompoundTag("InvSlots");
@@ -179,7 +175,7 @@ public class IC2Module {
 			if (OverclockerUpgradeStack.getItemDamage()   == meta && OverclockerUpgradeStack.itemID == id)
 				upgrades.overclocker += count;			
 		}
-		*/
+		
 		return upgrades;
 	}
 	

mcp/mobius/waila/addons/magicalcrops/HUDHandlerMagicalCrops.java

@@ -2,7 +2,7 @@ package mcp.mobius.waila.addons.magicalcrops;
 
 import java.util.List;
 
-import mcp.mobius.waila.cbcore.LangUtil;
+import codechicken.lib.lang.LangUtil;
 import net.minecraft.item.ItemStack;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;

mcp/mobius/waila/addons/openblocks/HUDHandlerTank.java

@@ -2,15 +2,15 @@ package mcp.mobius.waila.addons.openblocks;
 
 import java.util.List;
 
+import codechicken.lib.lang.LangUtil;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.common.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTankInfo;
 import net.minecraftforge.fluids.IFluidHandler;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
-import mcp.mobius.waila.cbcore.LangUtil;
 
 public class HUDHandlerTank implements IWailaDataProvider {
 

mcp/mobius/waila/addons/projectred/HUDDecoratorRsGateLogic.java

@@ -4,7 +4,7 @@ import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
-import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.common.ForgeDirection;
 import mcp.mobius.waila.api.IWailaBlockDecorator;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;

mcp/mobius/waila/addons/projectred/ProjectRedModule.java

@@ -4,7 +4,7 @@ import java.io.File;
 import java.util.logging.Level;
 
 import net.minecraft.block.Block;
-import net.minecraftforge.common.config.Configuration;
+import net.minecraftforge.common.Configuration;
 import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
 

mcp/mobius/waila/addons/railcraft/HUDHandlerTank.java

@@ -3,7 +3,7 @@ package mcp.mobius.waila.addons.railcraft;
 import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 
-import mcp.mobius.waila.cbcore.LangUtil;
+import codechicken.lib.lang.LangUtil;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.IFluidTank;

mcp/mobius/waila/addons/secretrooms/HUDTileEntityCamo.java

@@ -3,7 +3,6 @@ package mcp.mobius.waila.addons.secretrooms;
 import java.util.List;
 
 import net.minecraft.block.Block;
-import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import mcp.mobius.waila.api.IWailaConfigHandler;
@@ -14,7 +13,7 @@ public class HUDTileEntityCamo implements IWailaDataProvider {
 
 	@Override
 	public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		/*
+	
 		if (!config.getConfig("secretrooms.hide")) return null;
 		
 		if ( SecretRoomsModule.BlockCamoTrapDoor.isInstance(accessor.getBlock()) ){
@@ -23,7 +22,7 @@ public class HUDTileEntityCamo implements IWailaDataProvider {
 		}
 
 		else if ( SecretRoomsModule.BlockTorchLever.isInstance(accessor.getBlock()) ){
-			return new ItemStack(Blocks.torch);
+			return new ItemStack(Block.torchWood);
 		}		
 		
 		else if (accessor.getNBTData() != null){
@@ -35,7 +34,7 @@ public class HUDTileEntityCamo implements IWailaDataProvider {
 				return new ItemStack(copyID, 1, copyMeta);
 			}
 		}
-		*/
+		
 		return null;
 	}
 
@@ -56,7 +55,6 @@ public class HUDTileEntityCamo implements IWailaDataProvider {
 
 	private ItemStack getTrapDoorBlock(IWailaDataAccessor accessor){
 		// modify coordinates to get hinge Block.
-		/*
 		int i = accessor.getMetadata();
 		int j = accessor.getPosition().blockX;
 		int k = accessor.getPosition().blockZ;
@@ -85,8 +83,6 @@ public class HUDTileEntityCamo implements IWailaDataProvider {
 		int blockMeta = accessor.getWorld().getBlockMetadata(j, accessor.getPosition().blockY, k);
 		
 		return new ItemStack(blockID, 1, blockMeta);
-		*/
-		return null;
 	}
 	
 }

mcp/mobius/waila/addons/secretrooms/SecretRoomsModule.java

@@ -12,7 +12,6 @@ public class SecretRoomsModule {
 	public static Class  BlockCamoTrapDoor = null;
 	
 	public static void register(){
-		/*
 		try{
 			Class SecretRooms = Class.forName("com.github.AbrarSyed.secretroomsmod.common.SecretRooms");
 			Waila.log.log(Level.INFO, "SecretRooms mod found.");
@@ -40,7 +39,6 @@ public class SecretRoomsModule {
 		ModuleRegistrar.instance().registerStackProvider(new HUDTileEntityCamo(), BlockCamoTrapDoor);
 		ModuleRegistrar.instance().registerSyncedNBTKey("copyID",   TileEntityCamo);
 		ModuleRegistrar.instance().registerSyncedNBTKey("copyMeta", TileEntityCamo);
-		*/
 	}		
 	
 }

mcp/mobius/waila/addons/statues/HUDHandlerStatues.java

@@ -19,10 +19,11 @@ public class HUDHandlerStatues implements IWailaDataProvider {
 
 	@Override
 	public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
+		
 		try {
 			String skinName = (String)StatuesModule.skinName.get(accessor.getTileEntity());
 			if (skinName.equals("")){
-				TileEntity belowEnt = accessor.getWorld().getTileEntity(accessor.getPosition().blockX, accessor.getPosition().blockY - 1, accessor.getPosition().blockZ);
+				TileEntity belowEnt = accessor.getWorld().getBlockTileEntity(accessor.getPosition().blockX, accessor.getPosition().blockY - 1, accessor.getPosition().blockZ);
 				if (StatuesModule.TileEntityStatue.isInstance(belowEnt))
 					skinName = (String)StatuesModule.skinName.get(belowEnt);
 			}

mcp/mobius/waila/addons/stevescarts/HUDCartAssembler.java

@@ -12,6 +12,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
+import net.minecraftforge.common.ForgeDirection;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
@@ -32,7 +33,6 @@ public class HUDCartAssembler implements IWailaDataProvider {
 
 	@Override
 	public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		/*
 		if (!config.getConfig("stevescarts.showall")) return currenttip;
 		if (config.getConfig("stevescarts.shifttoggle") && !accessor.getPlayer().isSneaking()){
 			currenttip.add(ITALIC + "Press shift for more data");
@@ -75,7 +75,7 @@ public class HUDCartAssembler implements IWailaDataProvider {
 				currenttip.add(String.format("Time remaining : <Done>"));
 			else
 				currenttip.add(String.format("Time remaining : <Idle>"));
-		*/
+		
 		return currenttip;
 	}
 

mcp/mobius/waila/addons/stevescarts/StevesCartsModule.java

@@ -23,7 +23,6 @@ public class StevesCartsModule {
 	public static Method GetSelectionName = null;  // CargoItemSelection.getName
 	
 	public static void register(){
-		/*
 		try{
 			Class ModStevesCarts = Class.forName("vswe.stevescarts.StevesCarts");
 			Waila.log.log(Level.INFO, "StevesCarts mod found.");
@@ -73,8 +72,7 @@ public class StevesCartsModule {
 		ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityCartAssembler);
 		ModuleRegistrar.instance().registerSyncedNBTKey("*", MinecartModular);
 		ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityCargo);
-		ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityLiquid);	
-		*/		
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", TileEntityLiquid);			
 	}	
 	
 }

mcp/mobius/waila/addons/thaumcraft/HUDHandlerIAspectContainer.java

@@ -27,7 +27,6 @@ public class HUDHandlerIAspectContainer implements IWailaDataProvider {
 
 	@Override
 	public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		/*
 		if (!config.getConfig("thaumcraft.aspects")) return currenttip;
 		
 		ItemStack headSlot = accessor.getPlayer().inventory.armorInventory[3];
@@ -60,7 +59,7 @@ public class HUDHandlerIAspectContainer implements IWailaDataProvider {
 				}
 			}
 		}
-		*/
+		
 		return currenttip;
 	}
 
@@ -82,7 +81,6 @@ public class HUDHandlerIAspectContainer implements IWailaDataProvider {
 	}
 	
 	private boolean knowAspect(String name, IWailaDataAccessor accessor){
-		/*
 		try{
 			Object proxy    = ThaumcraftModule.TC_proxy.get(null);
 			Object known    = ThaumcraftModule.getKnownAspects.invoke(proxy, (Object[])null);
@@ -105,8 +103,6 @@ public class HUDHandlerIAspectContainer implements IWailaDataProvider {
 			WailaExceptionHandler.handleErr(e, this.getClass().getName(), null);
 			return false;
 		}
-		*/
-		return false;
 	}
 	
 }

mcp/mobius/waila/addons/thaumcraft/ThaumcraftModule.java

@@ -34,7 +34,7 @@ public class ThaumcraftModule {
 	public static Method list_getAspects = null; //AspectList.getAspects
 	
 	public static void register(){
-		/*
+
 		try{
 			Thaumcraft = Class.forName("thaumcraft.common.Thaumcraft");
 			Waila.log.log(Level.INFO, "Thaumcraft mod found.");
@@ -86,7 +86,7 @@ public class ThaumcraftModule {
 		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIAspectContainer(), IAspectContainer);
 		ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIAspectContainer(), TileAlchemyFurnace);
 		ModuleRegistrar.instance().registerSyncedNBTKey("*", IAspectContainer);
-		*/
+
 	}
 
 }

mcp/mobius/waila/addons/thermalexpansion/HUDHandlerConduitFluid.java

@@ -2,7 +2,7 @@ package mcp.mobius.waila.addons.thermalexpansion;
 
 import java.util.List;
 
-import mcp.mobius.waila.cbcore.LangUtil;
+import codechicken.lib.lang.LangUtil;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
@@ -26,7 +26,7 @@ public class HUDHandlerConduitFluid implements IWailaDataProvider {
 
 	@Override
 	public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		/*
+
 		if (!config.getConfig("thermalexpansion.fluidtype")) return currenttip;
 		
 		boolean found   = false;
@@ -51,7 +51,7 @@ public class HUDHandlerConduitFluid implements IWailaDataProvider {
 			currenttip.add(fluid.getFluid().getLocalizedName());			
 		else
 			currenttip.add(LangUtil.translateG("hud.msg.empty"));
-		*/
+		
 		return currenttip;
 	}
 

mcp/mobius/waila/addons/thermalexpansion/HUDHandlerConduitItem.java

@@ -23,7 +23,7 @@ public class HUDHandlerConduitItem implements IWailaDataProvider {
 
 	@Override
 	public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
-		/*
+		
 		if (!config.getConfig("thermalexpansion.conditemmode")) return currenttip;
 		
 		boolean found = false;
@@ -52,7 +52,7 @@ public class HUDHandlerConduitItem implements IWailaDataProvider {
 			currenttip.add("Mode : \u00a7fRound-Robin");			
 		else
 			currenttip.add("Mode : <UNKNOWN>");
-		 */
+
 		return currenttip;
 	}
 

mcp/mobius/waila/addons/thermalexpansion/HUDHandlerEnergyCell.java

@@ -2,7 +2,7 @@ package mcp.mobius.waila.addons.thermalexpansion;
 
 import java.util.List;
 
-import mcp.mobius.waila.cbcore.LangUtil;
+import codechicken.lib.lang.LangUtil;
 import net.minecraft.item.ItemStack;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;

mcp/mobius/waila/addons/thermalexpansion/HUDHandlerIEnergyHandler.java

@@ -4,7 +4,7 @@ import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.common.ForgeDirection;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;

mcp/mobius/waila/addons/thermalexpansion/HUDHandlerISecureTile.java

@@ -2,7 +2,7 @@ package mcp.mobius.waila.addons.thermalexpansion;
 
 import java.util.List;
 
-import mcp.mobius.waila.cbcore.LangUtil;
+import codechicken.lib.lang.LangUtil;
 import net.minecraft.item.ItemStack;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;

mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTank.java

@@ -3,7 +3,7 @@ package mcp.mobius.waila.addons.thermalexpansion;
 import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 
-import mcp.mobius.waila.cbcore.LangUtil;
+import codechicken.lib.lang.LangUtil;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 import mcp.mobius.waila.api.IWailaConfigHandler;

mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTesseract.java

@@ -2,7 +2,7 @@ package mcp.mobius.waila.addons.thermalexpansion;
 
 import java.util.List;
 
-import mcp.mobius.waila.cbcore.LangUtil;
+import codechicken.lib.lang.LangUtil;
 import net.minecraft.item.ItemStack;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;

mcp/mobius/waila/addons/thermalexpansion/ThermalExpansionModule.java

@@ -4,7 +4,7 @@ import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.logging.Level;
 
-import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.common.ForgeDirection;
 import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
 
@@ -42,7 +42,7 @@ public class ThermalExpansionModule {
 	//public static Field  TileConduitBase_isOutput = null;	
 	
 	public static void register(){
-		/*
+
 		try{
 			Class ModThermalExpansion = Class.forName("thermalexpansion.ThermalExpansion");
 			Waila.log.log(Level.INFO, "Thermal Expansion mod found.");
@@ -125,7 +125,7 @@ public class ThermalExpansionModule {
 		ModuleRegistrar.instance().registerSyncedNBTKey("*", TileTesseract);
 		ModuleRegistrar.instance().registerSyncedNBTKey("*", ISecureTile);
 		ModuleRegistrar.instance().registerSyncedNBTKey("*", BlockMultipart);
-		*/
+		
 	}
 	
 	

mcp/mobius/waila/addons/vanillamc/HUDHandlerVanilla.java

@@ -2,10 +2,9 @@ package mcp.mobius.waila.addons.vanillamc;
 
 import java.util.List;
 
+import codechicken.lib.lang.LangUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockSilverfish;
-import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemRecord;
 import net.minecraft.item.ItemStack;
@@ -15,26 +14,25 @@ import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
-import mcp.mobius.waila.cbcore.LangUtil;
 
 public class HUDHandlerVanilla implements IWailaDataProvider {
 
-	static Block mobSpawner    = Blocks.mob_spawner;
-	static Block crops         = Blocks.wheat;
-	static Block melonStem     = Blocks.melon_stem;
-	static Block pumpkinStem   = Blocks.pumpkin_stem;
-	static Block carrot        = Blocks.carrots;
-	static Block potato        = Blocks.potatoes;
-	static Block lever         = Blocks.lever;
-	static Block repeaterIdle  = Blocks.unpowered_repeater;
-	static Block repeaterActv  = Blocks.powered_repeater;
-	static Block comparatorIdl = Blocks.unpowered_comparator;
-	static Block comparatorAct = Blocks.powered_comparator;
-	static Block redstone      = Blocks.redstone_wire;
-	static Block jukebox       = Blocks.jukebox;
-	static Block cocoa		   = Blocks.cocoa;
-	static Block netherwart    = Blocks.nether_wart;
-	static Block silverfish    = Blocks.monster_egg;
+	static Block mobSpawner    = Block.mobSpawner;
+	static Block crops         = Block.crops;
+	static Block melonStem     = Block.melonStem;
+	static Block pumpkinStem   = Block.pumpkinStem;
+	static Block carrot        = Block.carrot;
+	static Block potato        = Block.potato;
+	static Block lever         = Block.lever;
+	static Block repeaterIdle  = Block.redstoneRepeaterIdle;
+	static Block repeaterActv  = Block.redstoneRepeaterActive;
+	static Block comparatorIdl = Block.redstoneComparatorIdle;
+	static Block comparatorAct = Block.redstoneComparatorActive;
+	static Block redstone      = Block.redstoneWire;
+	static Block jukebox       = Block.jukebox;
+	static Block cocoa		   = Block.cocoaPlant;
+	static Block netherwart    = Block.netherStalk;
+	static Block silverfish    = Block.silverfish;
 	
 	@Override
 	public ItemStack getWailaStack(IWailaDataAccessor accessor,	IWailaConfigHandler config) {
@@ -44,18 +42,18 @@ public class HUDHandlerVanilla implements IWailaDataProvider {
 			int metadata = accessor.getMetadata();
 			switch(metadata){
 			case 0:
-				return new ItemStack(Blocks.stone);
+				return new ItemStack(Block.stone);
 			case 1:
-				return new ItemStack(Blocks.cobblestone);
+				return new ItemStack(Block.cobblestone);
 			case 2:
-				return new ItemStack(Blocks.brick_block);
+				return new ItemStack(Block.stoneBrick);
 			default:
 				return null;
 			}
 		}
 
 		if (block == redstone){
-			return new ItemStack(Items.redstone);
+			return new ItemStack(Item.redstone);
 		}
 		
 		return null;
@@ -69,7 +67,7 @@ public class HUDHandlerVanilla implements IWailaDataProvider {
 		/* Mob spawner handler */
 		if (block == mobSpawner && accessor.getTileEntity() instanceof TileEntityMobSpawner && config.getConfig("vanilla.spawntype")){
 			String name = currenttip.get(0);
-			String mobname = ((TileEntityMobSpawner)accessor.getTileEntity()).func_145881_a().getEntityNameToSpawn();
+			String mobname = ((TileEntityMobSpawner)accessor.getTileEntity()).getSpawnerLogic().getEntityNameToSpawn();
 			currenttip.set(0, String.format("%s (%s)", name, mobname));
 		}
 
@@ -147,7 +145,6 @@ public class HUDHandlerVanilla implements IWailaDataProvider {
 				return currenttip;				
 			}	
 		
-		/*
 		if (config.getConfig("vanilla.jukebox"))
 			if (block == jukebox){
 				NBTTagCompound tag = accessor.getNBTData();
@@ -159,7 +156,6 @@ public class HUDHandlerVanilla implements IWailaDataProvider {
 					currenttip.add(LangUtil.translateG("hud.msg.empty"));
 				}
 			}
-		*/
 		
 		return currenttip;
 	}	
@@ -199,24 +195,24 @@ public class HUDHandlerVanilla implements IWailaDataProvider {
 		ModuleRegistrar.instance().registerBodyProvider(provider, cocoa.getClass());
 		ModuleRegistrar.instance().registerBodyProvider(provider, netherwart.getClass());			
 		
-		ModuleRegistrar.instance().registerSyncedNBTKey("*", mobSpawner.getClass());
-		ModuleRegistrar.instance().registerSyncedNBTKey("*", crops.getClass());
-		ModuleRegistrar.instance().registerSyncedNBTKey("*", melonStem.getClass());
-		ModuleRegistrar.instance().registerSyncedNBTKey("*", pumpkinStem.getClass());
-		ModuleRegistrar.instance().registerSyncedNBTKey("*", carrot.getClass());
-		ModuleRegistrar.instance().registerSyncedNBTKey("*", potato.getClass());
-		ModuleRegistrar.instance().registerSyncedNBTKey("*", lever.getClass());
-		ModuleRegistrar.instance().registerSyncedNBTKey("*", repeaterIdle.getClass());
-		ModuleRegistrar.instance().registerSyncedNBTKey("*", repeaterActv.getClass());
-		ModuleRegistrar.instance().registerSyncedNBTKey("*", comparatorIdl.getClass());
-		ModuleRegistrar.instance().registerSyncedNBTKey("*", comparatorAct.getClass());
-		ModuleRegistrar.instance().registerSyncedNBTKey("*", redstone.getClass());		
-		ModuleRegistrar.instance().registerSyncedNBTKey("*", jukebox.getClass());		
-		ModuleRegistrar.instance().registerSyncedNBTKey("*", cocoa.getClass());
-		ModuleRegistrar.instance().registerSyncedNBTKey("*", netherwart.getClass());		
-		ModuleRegistrar.instance().registerSyncedNBTKey("*", silverfish.getClass());	
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", Block.mobSpawner.getClass());
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", Block.crops.getClass());
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", Block.melonStem.getClass());
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", Block.pumpkinStem.getClass());
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", Block.carrot.getClass());
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", Block.potato.getClass());
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", Block.lever.getClass());
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", Block.redstoneRepeaterIdle.getClass());
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", Block.redstoneRepeaterActive.getClass());
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", Block.redstoneComparatorIdle.getClass());
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", Block.redstoneComparatorActive.getClass());
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", Block.redstoneWire.getClass());		
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", Block.jukebox.getClass());		
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", Block.cocoaPlant.getClass());
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", Block.netherStalk.getClass());		
+		ModuleRegistrar.instance().registerSyncedNBTKey("*", Block.silverfish.getClass());	
 		
-		//ModuleRegistrar.instance().registerDocTextFile("/mcp/mobius/waila/addons/vanillamc/WikiData.csv");
+		ModuleRegistrar.instance().registerDocTextFile("/mcp/mobius/waila/addons/vanillamc/WikiData.csv");
 		
 		//ExternalModulesHandler.instance().registerBlockDecorator(new HUDDecoratorVanilla(), repeaterIdle);
 	}

mcp/mobius/waila/api/IWailaDataAccessor.java

@@ -8,7 +8,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.common.ForgeDirection;
 
 /* The Accessor is used to get some basic data out of the game without having to request
  * direct access to the game engine.