Starting Localization! Yaaaaaaaaaay

This commit is contained in:
MysteriousAges committed 2013-02-12 17:21:29 -08:00
1 parent 0b510e8426
commit 902812e015
41 files changed
+480 -217

No files matched your search

Binary file not shown.

Before

Width:  |  Height:  |  Size: 61 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

@@ -1 +0,0 @@
storage.backpack.Thaumaturge=Thaumaturge's Backpack
+190
View File
@@ -0,0 +1,190 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
<properties version="1.0">
<!-- Item names -->
<entry key="item.jellyBabies.name">Handful of Jelly Babies</entry>
<!-- Block names -->
<!-- Comb names -->
<entry key="tb.comb.occult">Occult Comb</entry>
<entry key="tb.comb.otherworldly">Otherworldy Comb</entry>
<entry key="tb.comb.paper">Papery Comb</entry>
<entry key="tb.comb.stark">Stark Comb</entry>
<entry key="tb.comb.air">Airy Comb</entry>
<entry key="tb.comb.fire">Firey Comb</entry>
<entry key="tb.comb.water">Watery Comb</entry>
<entry key="tb.comb.earth">Earthy Comb</entry>
<entry key="tb.comb.magic">Infused Comb</entry>
<entry key="tb.comb.aware">Memory Comb</entry>
<entry key="tb.comb.furtive">Furtive Comb</entry>
<!-- Wax names -->
<entry key="tb.wax.magic">Magic Wax</entry>
<!-- Drop names -->
<entry key="tb.drop.enchanting">Enchanting Drop</entry>
<entry key="tb.drop.intellect">Intellect Drop</entry>
<!-- Pollen names -->
<entry key="tb.pollen.unusual">Unusual Pollen</entry>
<!-- Propolis names -->
<entry key="tb.propolis.dull">Dull Propolis</entry>
<entry key="tb.propolis.air">Breezey Propolis</entry>
<entry key="tb.propolis.fire">Burning Propolis</entry>
<entry key="tb.propolis.water">Flowing Propolis</entry>
<entry key="tb.propolis.earth">Stony Propolis</entry>
<entry key="tb.propolis.magic">Infused Propolis</entry>
<!-- Misc Resources -->
<entry key="tb.resource.fragment">Lore Fragment</entry>
<entry key="tb.resource.lump">Aromatic Lump</entry>
<entry key="tb.resource.fertilizer">Concentrated Compound</entry>
<entry key="tb.resource.crystalFlux">Crystalized %s Aspect</entry>
<!-- Frames -->
<entry key="tb.frame.magic">Magic Frame</entry>
<entry key="tb.frame.resillient">Resilient Frame</entry>
<entry key="tb.frame.gentle">Gentle Frame</entry>
<entry key="tb.frame.metabolic">Metabolic Frame</entry>
<entry key="tb.frame.necrotic">Necrotic Frame</entry>
<entry key="tb.frame.temporal">Temporal Frame</entry>
<!-- Capsule names -->
<entry key="tb.capsule.magic">Magic Capsule</entry>
<!-- Liquids -->
<entry key="tb.liquid.">Empty</entry>
<entry key="tb.liquid.water">Water</entry>
<entry key="tb.liquid.lava">Lava</entry>
<entry key="tb.liquid.biomass">Biomass</entry>
<entry key="tb.liquid.biofuel">Empty</entry>
<entry key="tb.liquid.Oil">Oil</entry>
<entry key="tb.liquid.Fuel">Fuel</entry>
<entry key="tb.liquid.seedoil">Seed Oil</entry>
<entry key="tb.liquid.honey">Honey</entry>
<entry key="tb.liquid.juice">Juice</entry>
<entry key="tb.liquid.ice">Ice</entry>
<entry key="tb.liquid.milk">Milk</entry>
<entry key="tb.liquid.acid">Acid</entry>
<entry key="tb.liquid.poison">Poison</entry>
<entry key="tb.liquid.liquidNitrogen">Liquid Nitrogen</entry>
<entry key="tb.liquid.liquidDNA">Liquid DNA</entry>
<entry key="tb.liquid.Creosote Oil">Creosote Oil</entry>
<entry key="tb.liquid.Steam">Steam</entry>
<!-- Moon Phases -->
<entry key="tb.moon.full">Full Moon</entry>
<entry key="tb.moon.gibbousWaning">Waning Gibbous</entry>
<entry key="tb.moon.gibousWaxing">Waxing Gibbous</entry>
<entry key="tb.moon.halfWaning">Waning Half</entry>
<entry key="tb.moon.halfWaxing">Waxing Half</entry>
<entry key="tb.moon.crescentWaning">Waning Crescent</entry>
<entry key="tb.moon.crescentWaxing">Waxing Crescent</entry>
<entry key="tb.moon.new">New Moon</entry>
<!-- Miscellaneous names -->
<entry key="tb.backpack.thaumaturge">Thaumaturge's Backpack</entry>
<!-- Species names -->
<entry key="thaumicbees.speciesEsoteric">Esoteric</entry>
<entry key="thaumicbees.speciesEsoteric.description">An unusual crossbreed which seems to have magical properties.|Apinomicon</entry>
<entry key="thaumicbees.speciesMysterious">Mysterious</entry>
<entry key="thaumicbees.speciesMysterious.description">These bees have been to the end of the world and back, and their power has grown.|Apinomicon</entry>
<entry key="thaumicbees.speciesArcane">Arcane</entry>
<entry key="thaumicbees.speciesArcane.description">"Their produce is charged with magic."|Azanor, Master Thaumaturge</entry>
<entry key="thaumicbees.speciesCharmed">Charmed</entry>
<entry key="thaumicbees.speciesCharmed.description">Your first experiments in Thaumaturgical Apiculture have yielded fruit. Buzzing fruit.|Apinomicon</entry>
<entry key="thaumicbees.speciesEnchanted">Enchanted</entry>
<entry key="thaumicbees.speciesEnchanted.description">Successive generations of Charmed bees have reinforced their connection to the unknown.|Apinomicon</entry>
<entry key="thaumicbees.speciesSupernatural">Supernatural</entry>
<entry key="thaumicbees.speciesSupernatural.description">These bees walk the line between this world and the unseen.|Apinomicon</entry>
<entry key="thaumicbees.speciesPupil">Pupil</entry>
<entry key="thaumicbees.speciesPupil.description">"What does that bee want with my paper?!|Yorae, Librarian</entry>
<entry key="thaumicbees.speciesScholarly">Scholarly</entry>
<entry key="thaumicbees.speciesScholarly.description">"I can't be sure, but I think they might be smarter than me..."|Yorae, Librarian</entry>
<entry key="thaumicbees.speciesSavant">Savant</entry>
<entry key="thaumicbees.speciesSavant.description">lim(x^(i / pi)/ log(e * 7 - ln(32/x^-pi))). Solve for honey.|Note found on Yorae's desk</entry>
<entry key="thaumicbees.speciesStark">Stark</entry>
<entry key="thaumicbees.speciesStark.description">"These are unusually attracted to shards. This warrents further investigation."|Azanor, Master Thaumaturge</entry>
<entry key="thaumicbees.speciesAura">Aura</entry>
<entry key="thaumicbees.speciesAura.description">"They work so fast it's breathtaking."|Sengir, Mad Apiarist</entry>
<entry key="thaumicbees.speciesIgnis">Ignis</entry>
<entry key="thaumicbees.speciesIgnis.description">Caution: Contents of hive extremely hot.|Warning label on Azanor's apiary</entry>
<entry key="thaumicbees.speciesAqua">Aqua</entry>
<entry key="thaumicbees.speciesAqua.description">"I tried to breed them once, but that was a wash."|MysteriousAges, Apprentice Thaumaturge</entry>
<entry key="thaumicbees.speciesSolum">Solum</entry>
<entry key="thaumicbees.speciesSolum.description">"You're really gonna dig these bees, but watch out - they bore quite easily."|MysteriousAges, Apprentice Comedian</entry>
<entry key="thaumicbees.speciesPraecantatio">Praecantatio</entry>
<entry key="thaumicbees.speciesPraecantatio.description">Beekeeping is magic!|Apinomicon, Preface</entry>
<entry key="thaumicbees.speciesAware">Aware</entry>
<entry key="thaumicbees.speciesAware.description">"They can see into your soul!"|Florastar, Expert Beekeeper</entry>
<entry key="thaumicbees.speciesVis">Vis</entry>
<entry key="thaumicbees.speciesVis.description">"They can feel changes in the aura, but are not yet able to affect it."|Azanor, research notes</entry>
<entry key="thaumicbees.speciesPure">Pure</entry>
<entry key="thaumicbees.speciesPure.description">"It's like a bee janitor!"|MysteriousAges, Thaumaturge</entry>
<entry key="thaumicbees.speciesFlux">Flux</entry>
<entry key="thaumicbees.speciesFlux.description">"I thought they would help clean up, but it only makes things worse!"|Kreicus, Apprentice Thaumaturge</entry>
<entry key="thaumicbees.speciesNode">Node</entry>
<entry key="thaumicbees.speciesNode.description">Having undergone a freak mutation, these bees now attract magic to them.|Apinomicon</entry>
<entry key="thaumicbees.speciesSkulking">Skulking</entry>
<entry key="thaumicbees.speciesSkulking.description">These bees have become xenophobic and bad-tempered. Use caution.|Apinomicon</entry>
<entry key="thaumicbees.speciesBrainy">Brainy</entry>
<entry key="thaumicbees.speciesBrainy.description">Their combs may be fetid and foul-smelling, but their intelligence is well-developed.|Apinomicon</entry>
<entry key="thaumicbees.speciesGossamer">Gossamer</entry>
<entry key="thaumicbees.speciesGossamer.description">As they work, they seem to fade out from light for brief moments.|Apinomicon</entry>
<entry key="thaumicbees.speciesWispy">Wispy</entry>
<entry key="thaumicbees.speciesWispy.description">Their language is garbled and unintelligible. It is probable they are speaking to unnatural beings.|Apinomicon</entry>
<entry key="thaumicbees.speciesBatty">Batty</entry>
<entry key="thaumicbees.speciesBatty.description">They tend to attract bats to their hives through means unknown.|Apinomicon</entry>
<entry key="thaumicbees.speciesGhastly">Ghastly</entry>
<entry key="thaumicbees.speciesGhastly.description">"*sigh*... Really, Myst?"|Taveria</entry>
<entry key="thaumicbees.speciesTimely">Timely</entry>
<entry key="thaumicbees.speciesTimely.description">"An apiarist is never late. He arrives precicely when he means to!"|Sengir, Mad Apiarist</entry>
<entry key="thaumicbees.speciesLordly">Lordly</entry>
<entry key="thaumicbees.speciesLordly.description">They live in peace, within the sight of the Eye of Harmony|Tattered Remains of ancient Apinomicon</entry>
<entry key="thaumicbees.speciesDoctoral">Doctoral</entry>
<entry key="thaumicbees.speciesDoctoral.description">"Would you like a Jelly Baby?"|Passing stranger with a great scarf and a blue box</entry>
<!-- Bee Alleles -->
<entry key="thaumicbees.effectCurative">Cleansing</entry>
<entry key="thaumicbees.effecteffectDigSpeed">Mining</entry>
<entry key="thaumicbees.effecteffectMoveSpeed">Swiftness</entry>
<entry key="thaumicbees.effecteffectSlowSpeed">Time Warp</entry>
<entry key="thaumicbees.effectNodeGeneration">Aura Attract</entry>
<entry key="thaumicbees.effectBrainy">Brainy</entry>
<entry key="thaumicbees.effectBatty">Batty</entry>
<entry key="thaumicbees.effectWispy">Wispy</entry>
<entry key="thaumicbees.Ghast">Ghastly</entry>
<entry key="tb.bees.flower.book">Books</entry>
<entry key="tb.bees.flower.magic">Magic Flowers</entry>
<entry key="tb.bees.flower.node">Node</entry>
<entry key="tb.bees.flower.nodePure">Purify Node</entry>
<entry key="tb.bees.flower.nodeFlux">Fluxify Node</entry>
<!-- Classifications -->
<entry key="classification.arcane">Arcane</entry>
<entry key="classification.arcane.latin">Arcanus</entry>
<entry key="classification.arcane.description"></entry>
<entry key="classification.supernatural">Supernatural</entry>
<entry key="classification.supernatural.latin">Coeleste</entry>
<entry key="classification.supernatural.description"></entry>
<entry key="classification.scholarly">Scholarly</entry>
<entry key="classification.scholarly.latin">Docto</entry>
<entry key="classification.scholarly.description"></entry>
<entry key="classification.thaumic">Thaumic</entry>
<entry key="classification.thaumic.latin">Thaumis</entry>
<entry key="classification.thaumic.description"></entry>
<entry key="classification.skulking">Skulking</entry>
<entry key="classification.skulking.latin">Malevolens</entry>
<entry key="classification.skulking.description"></entry>
<entry key="classification.vis">Vis</entry>
<entry key="classification.vis.latin">Patabilis</entry>
<entry key="classification.vis.description"></entry>
<entry key="classification.time">Time</entry>
<entry key="classification.time.latin">Sempiternus</entry>
<entry key="classification.time.description"></entry>
</properties>
+8 -8
View File
@@ -37,22 +37,22 @@ public class Allele implements IAllele
Allele.flowerNodeFluxify = new AlleleFlower("flowerAuraNodeFlux", new FlowerProviderAuraNodeFlux(), false);
Allele.cleansingEffect = new AlleleEffectCure("effectCurative", false);
Allele.digSpeed = new AlleleEffectPotion("effectDigSpeed", "Mining", Potion.digSpeed, 7, false);
Allele.moveSpeed = new AlleleEffectPotion("effectMoveSpeed", "Swiftness", Potion.moveSpeed, 5, false);
Allele.slowSpeed = new AlleleEffectPotion("effectSlowSpeed", "Time Warp", Potion.moveSlowdown, 3, false);
Allele.digSpeed = new AlleleEffectPotion("effectDigSpeed", Potion.digSpeed, 7, false);
Allele.moveSpeed = new AlleleEffectPotion("effectMoveSpeed", Potion.moveSpeed, 5, false);
Allele.slowSpeed = new AlleleEffectPotion("effectSlowSpeed", Potion.moveSlowdown, 3, false);
Allele.nodeGen = new AlleleEffectAuraNodeGrow("effectNodeGeneration", "Nodeify", false, 400);
Allele.nodeGen = new AlleleEffectAuraNodeGrow("effectNodeGeneration", false, 400);
Allele.spawnBrainyZombie = new AlleleEffectSpawnMob("effectBrainy", false, "Brainy", ThaumcraftHelper.Entity.BRAINY_ZOMBIE.entityID);
Allele.spawnBrainyZombie = new AlleleEffectSpawnMob("effectBrainy", false, ThaumcraftHelper.Entity.BRAINY_ZOMBIE.entityID);
Allele.spawnBrainyZombie.setAggrosPlayerOnSpawn().setThrottle(800).setSpawnsOnPlayerNear(null).setMaxMobsInSpawnZone(2);
Allele.spawnBats = new AlleleEffectSpawnMob("effectBatty", false, "Batty", ThaumcraftHelper.Entity.FIREBAT.entityID);
Allele.spawnBats = new AlleleEffectSpawnMob("effectBatty", false, ThaumcraftHelper.Entity.FIREBAT.entityID);
Allele.spawnBats.setThrottle(300).setSpawnsOnPlayerNear("Bat");
Allele.spawnWisp = new AlleleEffectSpawnWisp("effectWispy", false, "Wispy", ThaumcraftHelper.Entity.WISP.entityID);
Allele.spawnWisp = new AlleleEffectSpawnWisp("effectWispy", false, ThaumcraftHelper.Entity.WISP.entityID);
Allele.spawnWisp.setThrottle(1800);
Allele.spawnGhast = new AlleleEffectSpawnMob("Ghast", false, "Ghastly", "Ghast");
Allele.spawnGhast = new AlleleEffectSpawnMob("Ghast", false, "Ghast");
Allele.spawnGhast.setThrottle(2000).setChanceToSpawn(20).setMaxMobsInSpawnZone(1);
}
@@ -2,6 +2,8 @@ package thaumicbees.bees;
import java.util.List;
import cpw.mods.fml.common.registry.LanguageRegistry;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.AxisAlignedBB;
@@ -14,12 +16,10 @@ import forestry.api.genetics.IEffectData;
public abstract class AlleleEffect extends Allele implements IAlleleBeeEffect
{
protected String readableName;
public AlleleEffect(String id, boolean isDominant, String identifier)
public AlleleEffect(String id, boolean isDominant)
{
super(id, isDominant);
this.readableName = identifier;
}
@Override
@@ -34,7 +34,7 @@ public abstract class AlleleEffect extends Allele implements IAlleleBeeEffect
@Override
public String getIdentifier()
{
return this.readableName;
return LanguageRegistry.instance().getStringLocalization(getUID());
}
@Override
@@ -16,9 +16,9 @@ public class AlleleEffectAuraNodeGrow extends AlleleEffect
private int throttle;
public AlleleEffectAuraNodeGrow(String id, String identifier, boolean isDominant, int timeout)
public AlleleEffectAuraNodeGrow(String id, boolean isDominant, int timeout)
{
super(id, isDominant, identifier);
super(id, isDominant);
this.throttle = timeout;
}
@@ -21,7 +21,7 @@ public class AlleleEffectCure extends AlleleEffect
public AlleleEffectCure(String id, boolean isDominant)
{
super(id, isDominant, "Cleansing");
super(id, isDominant);
}
@Override
@@ -18,9 +18,9 @@ public class AlleleEffectPotion extends AlleleEffect
private int potionId;
private int duration;
public AlleleEffectPotion(String name, String readableName, Potion potionApplied, int effectDuration, boolean isDominant)
public AlleleEffectPotion(String name, Potion potionApplied, int effectDuration, boolean isDominant)
{
super("effect" + name, isDominant, readableName);
super("effect" + name, isDominant);
this.potionId = potionApplied.id;
this.duration = 20 * effectDuration;
}
@@ -25,9 +25,9 @@ public class AlleleEffectSpawnMob extends AlleleEffect
protected int chanceToSpawn;
protected int maxMobsInArea;
public AlleleEffectSpawnMob(String id, boolean isDominant, String identifier, String mobToSpawn)
public AlleleEffectSpawnMob(String id, boolean isDominant, String mobToSpawn)
{
super(id, isDominant, identifier);
super(id, isDominant);
this.aggosOnPlayer = false;
this.mobName = mobToSpawn;
this.throttle = 200;
@@ -18,9 +18,9 @@ public class AlleleEffectSpawnWisp extends AlleleEffectSpawnMob
private byte[] wispTypes = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47 };
public AlleleEffectSpawnWisp(String id, boolean isDominant, String identifier, String mobToSpawn)
public AlleleEffectSpawnWisp(String id, boolean isDominant, String mobToSpawn)
{
super(id, isDominant, identifier, mobToSpawn);
super(id, isDominant, mobToSpawn);
}
@Override
@@ -2,36 +2,32 @@ package thaumicbees.bees;
import java.util.ArrayList;
import cpw.mods.fml.common.registry.LanguageRegistry;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.IAlleleSpecies;
import forestry.api.genetics.IClassification;
public enum BeeClassification implements IClassification
{
ARCANE("Arcane", "Arcanus", ""),
SUPERNATURAL("Supernatural", "Coeleste", ""),
SCHOLARLY("Scholarly", "Docto", ""),
THAUMIC("Thaumic", "Thaumis", ""),
SKULKING("Skulking", "Malevolens", ""),
VIS("Vis", "Patabilis", ""),
TIME("Time", "Sempiternus", ""),
ARCANE("Arcane"),
SUPERNATURAL("Supernatural"),
SCHOLARLY("Scholarly"),
THAUMIC("Thaumic"),
SKULKING("Skulking"),
VIS("Vis"),
TIME("Time"),
;
private String uID;
private String name;
private String scientific;
private String description;
private ArrayList<IAlleleSpecies> species;
private IClassification parent;
private EnumClassLevel level;
private BeeClassification(String name, String latin, String desc)
private BeeClassification(String name)
{
this.uID = "classification." + name.toLowerCase();
this.name = name;
this.scientific = latin;
this.level = EnumClassLevel.GENUS;
this.description = desc;
this.species = new ArrayList();
this.parent = AlleleManager.alleleRegistry.getClassification("family.apidae");
AlleleManager.alleleRegistry.registerClassification(this);
@@ -52,19 +48,19 @@ public enum BeeClassification implements IClassification
@Override
public String getName()
{
return this.name;
return LanguageRegistry.instance().getStringLocalization(getUID());
}
@Override
public String getScientific()
{
return this.scientific;
return LanguageRegistry.instance().getStringLocalization(getUID() + ".latin");
}
@Override
public String getDescription()
{
return this.description;
return LanguageRegistry.instance().getStringLocalization(getUID() + ".description");
}
@Override
@@ -9,6 +9,8 @@ import forestry.api.genetics.IClassification.EnumClassLevel;
import java.util.HashMap;
import cpw.mods.fml.common.registry.LanguageRegistry;
import thaumicbees.compat.ForestryHelper;
import thaumicbees.compat.ThaumcraftHelper;
import thaumicbees.item.types.CombType;
@@ -25,63 +27,63 @@ import net.minecraft.world.World;
public enum BeeSpecies implements IAlleleBeeSpecies
{
ESOTERIC("Esoteric", "An unusual crossbreed which seems to have magical properties.|Apinomicon", "secretiore",
ESOTERIC("Esoteric", "secretiore",
BeeClassification.ARCANE, 0x001099, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
MYSTERIOUS("Mysterious", "These bees have been to the end of the world and back, and their power has grown.|Apinomicon", "mysticus",
MYSTERIOUS("Mysterious", "mysticus",
BeeClassification.ARCANE, 0x762bc2, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
ARCANE("Arcane", "\"Their produce is charged with magic.\"|Azanor, Master Thaumaturge", "arcanus",
ARCANE("Arcane", "arcanus",
BeeClassification.ARCANE, 0xd242df, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true),
CHARMED("Charmed", "Your first experiments in Thaumaturgical Apiculture have yielded fruit. Buzzing fruit.|Apinomicon", "larvatus",
CHARMED("Charmed", "larvatus",
BeeClassification.SUPERNATURAL, 0x48EEEC, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
ENCHANTED("Enchanted", "Successive generations of Charmed bees have reinforced their connection to the unknown.|Apinomicon", "cantatus",
ENCHANTED("Enchanted", "cantatus",
BeeClassification.SUPERNATURAL, 0x18e726, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
SUPERNATURAL("Supernatural", "These bees walk the line between this world and the unseen.|Apinomicon", "coeleste",
SUPERNATURAL("Supernatural", "coeleste",
BeeClassification.SUPERNATURAL, 0x005614, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true),
PUPIL("Pupil", "\"What does that bee want with my paper?!|Yorae, Librarian", "disciplina",
PUPIL("Pupil", "disciplina",
BeeClassification.SCHOLARLY, 0xFFFF00, EnumTemperature.NORMAL, EnumHumidity.ARID, false, true),
SCHOLARLY("Scholarly", "\"I can't be sure, but I think they might be smarter than me...\"|Yorae, Librarian", "studiosis",
SCHOLARLY("Scholarly", "studiosis",
BeeClassification.SCHOLARLY, 0x6E0000, EnumTemperature.NORMAL, EnumHumidity.ARID, false, false),
SAVANT("Savant", "lim(x^(i / pi)/ log(e * 7 - ln(32/x^-pi))). Solve for honey.|Note found on Yorae's desk", "philologus",
SAVANT("Savant", "philologus",
BeeClassification.SCHOLARLY, 0x6E1C6D, EnumTemperature.NORMAL, EnumHumidity.ARID, true, false),
STARK("Stark", "\"These are unusually attracted to shards. This warrents further investigation.\"|Azanor, Master Thaumaturge", "torridae",
STARK("Stark", "torridae",
BeeClassification.THAUMIC, 0xCCCCCC, 0x999999, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false),
AIR("Aura", "\"They work so fast it's breathtaking.\"|Sengir, Mad Apiarist", "ventosa",
AIR("Aura", "ventosa",
BeeClassification.THAUMIC, 0xD9D636, 0xA19E10, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true),
FIRE("Ignis", "Caution: Contents of hive extremely hot.|Warning label on Azanor's apiary", "praefervidus",
FIRE("Ignis", "praefervidus",
BeeClassification.THAUMIC, 0xE50B0B, 0x95132F, EnumTemperature.HOT, EnumHumidity.ARID, true, true),
WATER("Aqua", "\"I tried to breed them once, but that was a wash.\"|MysteriousAges, Apprentice Thaumaturge", "umidus",
WATER("Aqua", "umidus",
BeeClassification.THAUMIC, 0x36CFD9, 0x1054A1, EnumTemperature.NORMAL, EnumHumidity.DAMP, true, true),
EARTH("Solum", "\"You're really gonna dig these bees, but watch out - they bore quite easily.\"|MysteriousAges, Apprentice Comedian", "sordida",
EARTH("Solum", "sordida",
BeeClassification.THAUMIC, 0x005100, 0x00a000, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true),
INFUSED("Praecantatio", "Beekeeping is magic!|Apinomicon, Preface", "azanorius",
INFUSED("Praecantatio", "azanorius",
BeeClassification.THAUMIC, 0xaa32fc, 0x7A489E, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true),
AWARE("Aware", "\"They can see into your soul!\"|Florastar, Expert Beekeeper", "sensibilis",
AWARE("Aware", "sensibilis",
BeeClassification.VIS, 0xb0092e9, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false),
VIS("Vis", "\"They can feel changes in the aura, but are not yet able to affect it.\"|Azanor, research notes", "arcanus saecula",
VIS("Vis", "arcanus saecula",
BeeClassification.VIS, 0x004c99, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false),
PURE("Pure", "\"It's like a bee janitor!\"|MysteriousAges, Thaumaturge", "arcanus puritatem",
PURE("Pure", "arcanus puritatem",
BeeClassification.VIS, 0xb0092e9, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false),
FLUX("Flux", "\"I thought they would help clean up, but it only makes things worse!\"|Kreicus, Apprentice Thaumaturge", "arcanus labe",
FLUX("Flux", "arcanus labe",
BeeClassification.VIS, 0x004c99, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false),
NODE("Node", "Having undergone a freak mutation, these bees now attract magic to them.|Apinomicon", "conficiens",
NODE("Node", "conficiens",
BeeClassification.VIS, 0xFFF266, 0xFF8CE9, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false),
SKULKING("Skulking", "These bees have become xenophobic and bad-tempered. Use caution.|Apinomicon", "malevolens",
SKULKING("Skulking", "malevolens",
BeeClassification.SKULKING, 0x524827, 0xe15236, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
BRAINY("Brainy", "Their combs may be fetid and foul-smelling, but their intelligence is well-developed.|Apinomicon", "cerebrum",
BRAINY("Brainy", "cerebrum",
BeeClassification.SKULKING, 0x83FF70, 0xe15236, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
GOSSAMER("Gossamer", "As they work, they seem to fade out from light for brief moments.|Apinomicon", "perlucidus",
GOSSAMER("Gossamer", "perlucidus",
BeeClassification.SKULKING, 0x183f66, 0xe15236, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
WISPY("Wispy", "Their language is garbled and unintelligible. It is probable they are speaking to unnatural beings.|Apinomicon", "umbrabilis",
WISPY("Wispy", "umbrabilis",
BeeClassification.SKULKING, 0x9cb8d5, 0xe15236, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false),
BATTY("Batty", "They tend to attract bats to their hives through means unknown.|Apinomicon", "chiroptera",
BATTY("Batty", "chiroptera",
BeeClassification.SKULKING, 0x27350d, 0xe15236, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false,true),
GHASTLY("Ghastly", "\"*sigh*... Really, Myst?\"|Taveria", "pallens",
GHASTLY("Ghastly", "pallens",
BeeClassification.SKULKING, 0xccccee, 0xbf877c, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false),
TIMELY("Timely", "\"An apiarist is never late. He arrives precicely when he means to!\"|Sengir, Mad Apiarist", "gallifreis",
TIMELY("Timely", "gallifreis",
BeeClassification.TIME, 0xC6AF86, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
LORDLY("Lordly", "", "rassilonis",
LORDLY("Lordly", "rassilonis",
BeeClassification.TIME, 0xC6AF86, 0x8E0213, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false),
DOCTORAL("Doctoral", "\"Would you like a Jelly Baby?\"", "medicus qui",
DOCTORAL("Doctoral", "medicus qui",
BeeClassification.TIME, 0xDDE5FC, 0x4B6E8C, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false),
;
@@ -182,17 +184,17 @@ public enum BeeSpecies implements IAlleleBeeSpecies
TIMELY.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.DRIPPING.ordinal()), 25)
.setGenome(BeeGenomeManager.getTemplateTimely())
.register();
LORDLY.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.MYSTERIOUS.ordinal()), 30)
LORDLY.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.MYSTERIOUS.ordinal()), 5)
.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.DRIPPING.ordinal()), 25)
.setGenome(BeeGenomeManager.getTemplateLordly())
.register();
DOCTORAL.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.MYSTERIOUS.ordinal()), 35)
.addSpecialty(new ItemStack(Config.jellyBaby), 5)
DOCTORAL.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.MYSTERIOUS.ordinal()), 10)
.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.DRIPPING.ordinal()), 30)
.addSpecialty(new ItemStack(Config.jellyBaby), 4)
.setGenome(BeeGenomeManager.getTemplateDoctoral())
.register();
}
private String name;
private String descripton;
private String binomial;
private String authority;
private int bodyType;
@@ -210,23 +212,21 @@ public enum BeeSpecies implements IAlleleBeeSpecies
private String uid;
private boolean dominant;
private BeeSpecies(String speciesName, String speciesDescription, String genusName, IClassification classification, int firstColour, EnumTemperature preferredTemp, EnumHumidity preferredHumidity, boolean hasGlowEffect, boolean isSpeciesDominant)
private BeeSpecies(String speciesName, String genusName, IClassification classification, int firstColour, EnumTemperature preferredTemp, EnumHumidity preferredHumidity, boolean hasGlowEffect, boolean isSpeciesDominant)
{
this(speciesName, speciesDescription, genusName, classification, 0, firstColour, 0xFF6E0D, preferredTemp, preferredHumidity, hasGlowEffect, true, true, isSpeciesDominant);
this(speciesName, genusName, classification, 0, firstColour, 0xFF6E0D, preferredTemp, preferredHumidity, hasGlowEffect, true, true, isSpeciesDominant);
}
private BeeSpecies(String speciesName, String speciesDescription, String genusName, IClassification classification, int firstColour, int secondColour, EnumTemperature preferredTemp, EnumHumidity preferredHumidity, boolean hasGlowEffect, boolean isSpeciesDominant)
private BeeSpecies(String speciesName, String genusName, IClassification classification, int firstColour, int secondColour, EnumTemperature preferredTemp, EnumHumidity preferredHumidity, boolean hasGlowEffect, boolean isSpeciesDominant)
{
this(speciesName, speciesDescription, genusName, classification, 0, firstColour, secondColour, preferredTemp, preferredHumidity, hasGlowEffect, true, true, isSpeciesDominant);
this(speciesName, genusName, classification, 0, firstColour, secondColour, preferredTemp, preferredHumidity, hasGlowEffect, true, true, isSpeciesDominant);
}
private BeeSpecies(String speciesName, String speciesDescription, String genusName, IClassification classification, int body, int firstColour, int secondColour, EnumTemperature preferredTemp, EnumHumidity preferredHumidity, boolean hasGlowEffect, boolean isSpeciesSecret, boolean isSpeciesCounted, boolean isSpeciesDominant)
private BeeSpecies(String speciesName, String genusName, IClassification classification, int body, int firstColour, int secondColour, EnumTemperature preferredTemp, EnumHumidity preferredHumidity, boolean hasGlowEffect, boolean isSpeciesSecret, boolean isSpeciesCounted, boolean isSpeciesDominant)
{
this.uid = "thaumicbees.species" + speciesName;
this.dominant = isSpeciesDominant;
AlleleManager.alleleRegistry.registerAllele(this);
name = speciesName;
descripton = speciesDescription;
binomial = genusName;
authority = "MysteriousAges";
bodyType = body;
@@ -273,12 +273,12 @@ public enum BeeSpecies implements IAlleleBeeSpecies
public String getName()
{
return name;
return LanguageRegistry.instance().getStringLocalization(getUID());
}
public String getDescription()
{
return descripton;
return LanguageRegistry.instance().getStringLocalization(getUID() + ".description");
}
public int getBodyType()
@@ -1,5 +1,6 @@
package thaumicbees.bees;
import cpw.mods.fml.common.registry.LanguageRegistry;
import thaumcraft.api.AuraNode;
import thaumcraft.api.ThaumcraftApi;
import thaumicbees.main.Config;
@@ -44,7 +45,7 @@ public class FlowerProviderAuraNode implements IFlowerProvider
@Override
public String getDescription()
{
return "Node";
return LanguageRegistry.instance().getStringLocalization("tb.bees.flower.node");
}
@Override
@@ -1,5 +1,6 @@
package thaumicbees.bees;
import cpw.mods.fml.common.registry.LanguageRegistry;
import thaumcraft.api.EnumTag;
import thaumcraft.api.ObjectTags;
import thaumcraft.api.ThaumcraftApi;
@@ -37,6 +38,6 @@ public class FlowerProviderAuraNodeFlux extends FlowerProviderAuraNode
@Override
public String getDescription()
{
return "Node Flux";
return LanguageRegistry.instance().getStringLocalization("tb.bees.flower.nodeFlux");
}
}
@@ -1,5 +1,6 @@
package thaumicbees.bees;
import cpw.mods.fml.common.registry.LanguageRegistry;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
@@ -21,7 +22,7 @@ public class FlowerProviderAuraNodePurify extends FlowerProviderAuraNode
@Override
public String getDescription()
{
return "Node Purify";
return LanguageRegistry.instance().getStringLocalization("tb.bees.flower.nodePure");
}
@Override
@@ -1,5 +1,6 @@
package thaumicbees.bees;
import cpw.mods.fml.common.registry.LanguageRegistry;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
@@ -46,6 +47,6 @@ public class FlowerProviderBookshelf implements IFlowerProvider
public String getDescription()
{
return "Books";
return LanguageRegistry.instance().getStringLocalization("tb.bees.flower.book");
}
}
@@ -1,5 +1,6 @@
package thaumicbees.bees;
import cpw.mods.fml.common.registry.LanguageRegistry;
import thaumicbees.main.Config;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
@@ -36,7 +37,6 @@ public class FlowerProviderThaumcraftFlower implements IFlowerProvider
{
int rand = world.rand.nextInt(10);
world.setBlockAndMetadataWithNotify(x, y, z, Config.tcPlant.blockID, (rand >= 5) ? 2 : 3);
System.out.println(x + ", " + y + ", " + ", " + z + " set to flower.");
flag = true;
}
return flag;
@@ -45,7 +45,7 @@ public class FlowerProviderThaumcraftFlower implements IFlowerProvider
@Override
public String getDescription()
{
return "Magic Flowers";
return LanguageRegistry.instance().getStringLocalization("tb.bees.flower.magic");
}
@Override
@@ -26,6 +26,7 @@ import thaumicbees.main.Config;
import thaumicbees.main.ThaumicBees;
import thaumicbees.storage.BackpackDefinition;
import cpw.mods.fml.common.FMLLog;
import cpw.mods.fml.common.event.FMLInterModComms;
import cpw.mods.fml.common.registry.GameRegistry;
import forestry.api.apiculture.EnumBeeChromosome;
@@ -57,7 +58,7 @@ public class CompatabilityManager
}
catch (Exception e)
{
FMLLog.warning("Could not get Extra Bees item: " + field + ". If you notice this, please report the issue on the Thaumic Bees thread.");
}
return value;
}
@@ -221,12 +222,12 @@ public class CompatabilityManager
itemStack = ItemInterface.getItem("beealyzer");
tags = new ObjectTags().add(EnumTag.VALUABLE, 3).add(EnumTag.MECHANISM, 3).add(EnumTag.METAL, 19)
.add(EnumTag.POWER, 8).add(EnumTag.CRYSTAL, 18);
.add(EnumTag.POWER, 8).add(EnumTag.TOOL, 18);
ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags);
itemStack = ItemInterface.getItem("treealyzer");
tags = new ObjectTags().add(EnumTag.POWER, 3).add(EnumTag.PURE, 3).add(EnumTag.LIFE, 6)
.add(EnumTag.CRYSTAL, 12).add(EnumTag.METAL, 19);
.add(EnumTag.TOOL, 12).add(EnumTag.METAL, 19);
ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags);
itemStack = ItemInterface.getItem("apatite");
@@ -234,11 +235,11 @@ public class CompatabilityManager
ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags);
itemStack = ItemInterface.getItem("impregnatedCasing");
tags = new ObjectTags().add(EnumTag.WOOD, 58).add(EnumTag.PLANT, 8);
tags = new ObjectTags().add(EnumTag.WOOD, 56).add(EnumTag.EXCHANGE, 8);
ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags);
itemStack = ItemInterface.getItem("stickImpregnated");
tags = new ObjectTags().add(EnumTag.WOOD, 8).add(EnumTag.PLANT, 2);
tags = new ObjectTags().add(EnumTag.WOOD, 6).add(EnumTag.EXCHANGE, 2);
ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags);
itemStack = ItemInterface.getItem("peat");
@@ -403,8 +404,9 @@ public class CompatabilityManager
{
ObjectTags tags;
ResearchItem startNode = new ResearchItem("TBSTARTNODE", null, 10, 0, Config.miscResources.getStackForType(ResourceType.RESEARCH_StartNode))
.setAutoUnlock()
tags = new ObjectTags().add(EnumTag.WOOD, 10).add(EnumTag.PLANT, 10).add(EnumTag.INSECT, 10);
ResearchItem startNode = new ResearchItem("TBSTARTNODE", tags, 10, 0, Config.miscResources.getStackForType(ResourceType.RESEARCH_StartNode))
.setParents(ResearchList.getResearch("UTFT"))
.registerResearchItem();
tags = new ObjectTags().add(EnumTag.INSECT, 9).add(EnumTag.MAGIC, 4).add(EnumTag.FLUX, 4);
@@ -415,7 +417,7 @@ public class CompatabilityManager
tags = new ObjectTags().add(EnumTag.INSECT, 15).add(EnumTag.MAGIC, 5).add(EnumTag.WATER, 5).add(EnumTag.EARTH, 5)
.add(EnumTag.WIND, 5).add(EnumTag.FIRE, 5);
ResearchItem beeInfusion = new ResearchItem("BEEINFUSION", tags, 5, 3, Config.miscResources.getStackForType(ResourceType.RESEARCH_BeeInfusion))
.setParents(starkHint, ResearchList.getResearch("UTFT")).setHidden()
.setParents(starkHint).setHidden()
.registerResearchItem();
tags = new ObjectTags().add(EnumTag.CROP, 20).add(EnumTag.EARTH, 20).add(EnumTag.WATER, 5);
@@ -423,7 +425,7 @@ public class CompatabilityManager
.setParents(startNode)
.registerResearchItem();
tags = new ObjectTags().add(EnumTag.WOOD, 10).add(EnumTag.TOOL, 6).add(EnumTag.INSECT, 15).add(EnumTag.BEAST, 2)
tags = new ObjectTags().add(EnumTag.TOOL, 6).add(EnumTag.INSECT, 15).add(EnumTag.BEAST, 2)
.add(EnumTag.MAGIC, 5);
ResearchItem magicFrame = new ResearchItem("HIVEFRAME", tags, 10, -2, Config.hiveFrameMagic)
.setParents(startNode)
@@ -43,7 +43,7 @@ public class ItemCapsule extends Item
@Override
public String getItemDisplayName(ItemStack itemStack)
{
return LiquidType.values()[itemStack.getItemDamage()].displayName + " " + this.capsuleType.name;
return LiquidType.values()[itemStack.getItemDamage()].getDisplayName() + " " + this.capsuleType.getName();
}
public ItemStack getCapsuleForLiquid(LiquidType l)
@@ -89,13 +89,7 @@ public class ItemComb extends Item
@Override
public String getItemDisplayName(ItemStack stack)
{
String result = "";
int meta = stack.getItemDamage();
if (meta >= 0 && meta < CombType.values().length)
{
result = CombType.values()[meta].name;
}
return result;
return CombType.values()[stack.getItemDamage()].getName();
}
}
@@ -3,8 +3,10 @@ package thaumicbees.item;
import java.util.List;
import thaumicbees.item.types.DropType;
import thaumicbees.item.types.PropolisType;
import thaumicbees.main.CommonProxy;
import thaumicbees.main.ThaumicBees;
import cpw.mods.fml.common.registry.LanguageRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import forestry.api.core.Tabs;
@@ -85,13 +87,7 @@ public class ItemDrop extends Item
@Override
public String getItemDisplayName(ItemStack stack)
{
String result = "";
int meta = stack.getItemDamage();
if (meta >= 0 && meta < DropType.values().length)
{
result = DropType.values()[meta].name;
}
return result;
return DropType.values()[stack.getItemDamage()].getName();
}
}
@@ -35,7 +35,7 @@ public class ItemMagicHiveFrame extends Item implements IHiveFrame
@Override
public String getItemDisplayName(ItemStack itemStack)
{
return this.type.frameName;
return this.type.getName();
}
// --------- IHiveFrame functions -----------------------------------------
@@ -59,13 +59,7 @@ public class ItemMiscResources extends Item
@Override
public String getItemDisplayName(ItemStack stack)
{
String result = "";
int meta = stack.getItemDamage();
if (meta >= 0 && meta < ResourceType.values().length)
{
result = ResourceType.values()[meta].name;
}
return result;
return ResourceType.values()[stack.getItemDamage()].getName();
}
}
@@ -84,13 +84,7 @@ public class ItemPollen extends Item
@Override
public String getItemDisplayName(ItemStack stack)
{
String result = "";
int meta = stack.getItemDamage();
if (meta >= 0 && meta < PollenType.values().length)
{
result = PollenType.values()[meta].name;
}
return result;
return PollenType.values()[stack.getItemDamage()].getName();
}
}
@@ -57,13 +57,7 @@ public class ItemPropolis extends Item
@Override
public String getItemDisplayName(ItemStack stack)
{
String result = "";
int meta = stack.getItemDamage();
if (meta >= 0 && meta < PropolisType.values().length)
{
result = PropolisType.values()[meta].name;
}
return result;
return PropolisType.values()[stack.getItemDamage()].getName();
}
}
@@ -2,11 +2,13 @@ package thaumicbees.item;
import java.util.List;
import cpw.mods.fml.common.registry.LanguageRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import forestry.api.core.Tabs;
import thaumcraft.api.EnumTag;
import thaumicbees.main.CommonProxy;
import thaumicbees.main.utils.LocalizationManager;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@@ -32,7 +34,6 @@ public class ItemSolidFlux extends Item
{
continue;
}
list.add(new ItemStack(this.itemID, 1, tag.id));
}
}
@@ -40,7 +41,7 @@ public class ItemSolidFlux extends Item
@Override
public String getItemDisplayName(ItemStack stack)
{
return "Crystalized " + EnumTag.get(stack.getItemDamage()).name + " Aspect";
return String.format(LanguageRegistry.instance().getStringLocalization("tb.resource.crystalFlux"), EnumTag.get(stack.getItemDamage()).name);
}
@Override
@@ -70,12 +70,6 @@ public class ItemWax extends Item
@Override
public String getItemDisplayName(ItemStack stack)
{
String result = "";
int meta = stack.getItemDamage();
if (meta >= 0 && meta < WaxType.values().length)
{
result = WaxType.values()[meta].name;
}
return result;
return WaxType.values()[stack.getItemDamage()].getName();
}
}
@@ -1,10 +1,12 @@
package thaumicbees.item.types;
import cpw.mods.fml.common.registry.LanguageRegistry;
public enum CapsuleType
{
MAGIC("Magic Capsule", 2000, 0),
MAGIC("magic", 2000, 0),
;
public String name;
private String name;
public int capacity;
public int iconIdx;
@@ -14,4 +16,9 @@ public enum CapsuleType
this.capacity = c;
this.iconIdx = idx;
}
public String getName()
{
return LanguageRegistry.instance().getStringLocalization("tb.capsule." + name);
}
}
@@ -1,18 +1,20 @@
package thaumicbees.item.types;
import cpw.mods.fml.common.registry.LanguageRegistry;
public enum CombType
{
OCCULT("Occult Comb", 0x6e1c6d, 0xff8fff, true),
OTHERWORLDLY("Otherworldy Comb", 0x000056, 0x765cc1, true),
PAPERY("Papery Comb", 0x503900, 0xbd9a30, true),
STARK("Stark Comb", 0xB0B0BC, 0x6e6e79, false),
AIRY("Airy Comb", 0xffff7e, 0x717600, false),
FIREY("Firey Comb", 0xff3C01, 0x740002, false),
WATERY("Watery Comb", 0x0090ff, 0x00308c, false),
EARTHY("Earthy Comb", 0x00a000, 0x005100, false),
INFUSED("Infused Comb", 0xaa32fc, 0x7A489E, false),
INTELLECT("Memory Comb", 0x618fff, 0xb0092e9, false),
SKULKING("Furtive Comb", 0x545454, 0xcda6cd, true),
OCCULT("occult", 0x6e1c6d, 0xff8fff, true),
OTHERWORLDLY("otherworldly", 0x000056, 0x765cc1, true),
PAPERY("paper", 0x503900, 0xbd9a30, true),
STARK("stark", 0xB0B0BC, 0x6e6e79, false),
AIRY("air", 0xffff7e, 0x717600, false),
FIREY("fire", 0xff3C01, 0x740002, false),
WATERY("water", 0x0090ff, 0x00308c, false),
EARTHY("earth", 0x00a000, 0x005100, false),
INFUSED("magic", 0xaa32fc, 0x7A489E, false),
INTELLECT("aware", 0x618fff, 0xb0092e9, false),
SKULKING("furtive", 0x545454, 0xcda6cd, true),
;
private CombType(String pName, int colourA, int colourB, boolean show)
@@ -25,7 +27,12 @@ public enum CombType
this.showInList = show;
}
public final String name;
private String name;
public int[] combColour;
public boolean showInList;
public String getName()
{
return LanguageRegistry.instance().getStringLocalization("tb.comb." + this.name);
}
}
@@ -1,9 +1,11 @@
package thaumicbees.item.types;
import cpw.mods.fml.common.registry.LanguageRegistry;
public enum DropType
{
ENCHANTED("Enchanting Drop", 0x6e1c6d, 0xff8fff),
INTELLECT("Intellect Drop", 0x25914D, 0x18E072),
ENCHANTED("enchanting", 0x6e1c6d, 0xff8fff),
INTELLECT("intellect", 0x25914D, 0x18E072),
;
private DropType(String pName, int colourA, int colourB)
@@ -13,6 +15,11 @@ public enum DropType
this.combColour[1] = colourB;
}
public final String name;
private final String name;
public int[] combColour = new int[2];
public String getName()
{
return LanguageRegistry.instance().getStringLocalization("tb.drop." + this.name);
}
}
@@ -1,21 +1,22 @@
package thaumicbees.item.types;
import cpw.mods.fml.common.registry.LanguageRegistry;
import thaumcraft.api.EnumTag;
import thaumcraft.api.ObjectTags;
public enum HiveFrameType
{
MAGIC("Magic Frame", 32, 240, 1f, 1f, 1f, 2f, 2,
MAGIC("magic", 32, 240, 1f, 1f, 1f, 2f, 2,
null),
RESILIENT("Resilient Frame", 33, 840, 1f, 1f, 1f, 2f, 2,
RESILIENT("resillient", 33, 840, 1f, 1f, 1f, 2f, 2,
new ObjectTags().add(EnumTag.ARMOR, 1)),
GENTLE("Gentle Frame", 34, 200, 1f, 0.7f, 1.5f, 1.4f, 1,
GENTLE("gentle", 34, 200, 1f, 0.7f, 1.5f, 1.4f, 1,
new ObjectTags().add(EnumTag.HEAL, 1).add(EnumTag.LIFE, 1)),
METABOLIC("Metabolic Frame", 35, 120, 1f, 1.8f, 1f, 1.2f, 5,
METABOLIC("metabolic", 35, 120, 1f, 1.8f, 1f, 1.2f, 5,
new ObjectTags().add(EnumTag.EXCHANGE, 1).add(EnumTag.MOTION, 1)),
NECROTIC("Necrotic Frame", 36, 290, 1f, 1f, 0.3f, 0.75f, 1,
NECROTIC("necrotic", 36, 290, 1f, 1f, 0.3f, 0.75f, 1,
new ObjectTags().add(EnumTag.DEATH, 3).add(EnumTag.POISON, 2)),
TEMPORAL("Temporal Frame", 37, 300, 1f, 1f, 2.5f, 1f, 1,
TEMPORAL("temporal", 37, 300, 1f, 1f, 2.5f, 1f, 1,
new ObjectTags().add(EnumTag.TIME, 5)),
;
@@ -49,7 +50,7 @@ public enum HiveFrameType
this.flux = fluxTags;
}
public String frameName;
private String frameName;
public int iconIdx;
public int maxDamage;
@@ -65,4 +66,9 @@ public enum HiveFrameType
public ObjectTags flux;
public int auraPerUse;
public String getName()
{
return LanguageRegistry.instance().getStringLocalization("tb.frame." + this.frameName);
}
}
@@ -1,50 +1,56 @@
package thaumicbees.item.types;
import cpw.mods.fml.common.registry.LanguageRegistry;
import net.minecraftforge.liquids.LiquidDictionary;
public enum LiquidType
{
// Incidentally, Item meta is the liquid ID.
// Args are: forgeLiquidID, Display Name, Icon idx
EMPTY("", "Empty", 16),
EMPTY("", 16),
// Vanilla
WATER("water", "Water", 17),
LAVA("lava", "Lava", 18),
WATER("water", 17),
LAVA("lava", 18),
// Forestry
BIOMASS("biomass", "Biomass", 19),
BIOFUEL("biofuel", "Biofuel", 20),
BIOMASS("biomass", 19),
BIOFUEL("biofuel", 20),
// Buildcraft
OIL("Oil", "Oil", 21),
FUEL("Fuel", "Fuel", 22),
OIL("Oil", 21),
FUEL("Fuel", 22),
// More Forestry
SEEDOIL("seedoil", "Seed Oil", 23),
HONEY("honey", "Honey", 24),
JUICE("juice", "Juice", 25),
CRUSHEDICE("ice", "Crushed Ice", 26),
MILK("milk", "Milk", 27),
SEEDOIL("seedoil", 23),
HONEY("honey", 24),
JUICE("juice", 25),
CRUSHEDICE("ice", 26),
MILK("milk", 27),
// ExtraBees liquids
ACID("acid", "Acid", 28),
POISON("poison", "Poison", 29),
LIQUIDNITROGEN("liquidNitrogen", "Liquid Nitrogen", 30),
DNA("liquidDNA", "Liquid DNA", 31),
ACID("acid", 28),
POISON("poison", 29),
LIQUIDNITROGEN("liquidNitrogen", 30),
DNA("liquidDNA", 31),
// Railcraft
CREOSOTEOIL("Creosote Oil", "Creosote Oil", 32),
STEAM("Steam", "Steam", 33),
CREOSOTEOIL("Creosote Oil", 32),
STEAM("Steam", 33),
;
public String liquidID;
public String displayName;
public int iconIdx;
public boolean available = false;
private LiquidType(String l, String display, int idx)
private LiquidType(String l, int idx)
{
this.liquidID = l;
this.displayName = display;
this.iconIdx = idx;
}
public String getDisplayName()
{
return LanguageRegistry.instance().getStringLocalization("tb.liquid." + liquidID);
}
}
@@ -1,8 +1,10 @@
package thaumicbees.item.types;
import cpw.mods.fml.common.registry.LanguageRegistry;
public enum PollenType
{
UNUSUAL("Unusual Pollen", 0xA03059, 0xD8417B),
UNUSUAL("unusual", 0xA03059, 0xD8417B),
;
private PollenType(String pName, int colourA, int colourB)
@@ -12,6 +14,11 @@ public enum PollenType
this.combColour[1] = colourB;
}
public final String name;
private String name;
public int[] combColour = new int[2];
public String getName()
{
return LanguageRegistry.instance().getStringLocalization("tb.pollen." + this.name);
}
}
@@ -1,13 +1,15 @@
package thaumicbees.item.types;
import cpw.mods.fml.common.registry.LanguageRegistry;
public enum PropolisType
{
STARK("Dull Propolis", 0xBBBBBB),
AIR("Air Propolis", 0xA19E10),
FIRE("Firey Propolis", 0x95132F),
WATER("Watery Propolis", 0x1054A1),
EARTH("Earthen Propolis", 0x00a000),
INFUSED("Infused Propolis", 0xaa32fc),
STARK("dull", 0xBBBBBB),
AIR("air", 0xA19E10),
FIRE("fire", 0x95132F),
WATER("water", 0x1054A1),
EARTH("earth", 0x00a000),
INFUSED("magic", 0xaa32fc),
;
private PropolisType(String pName, int overlayColour)
@@ -16,6 +18,11 @@ public enum PropolisType
this.colour = overlayColour;
}
public String name;
private String name;
public int colour;
public String getName()
{
return LanguageRegistry.instance().getStringLocalization("tb.propolis." + this.name);
}
}
@@ -1,12 +1,15 @@
package thaumicbees.item.types;
import cpw.mods.fml.common.registry.LanguageRegistry;
public enum ResourceType
{
LORE_FRAGMENT("Lore Fragment", 2, true),
AROMATIC_LUMP("Aromatic Lump", 3, true),
EXTENDED_FERTILIZER("Concentrated Compound", 4, true),
LORE_FRAGMENT("fragment", 2, true),
AROMATIC_LUMP("lump", 3, true),
EXTENDED_FERTILIZER("fertilizer", 4, true),
// Dummy items for Thaumanomicon research icons.
// These won't ever actually exist in-game, and so
RESEARCH_StartNode("Start Node", 241, false),
RESEARCH_BeeInfusion("Bee Infusion", 240, false),
;
@@ -17,7 +20,12 @@ public enum ResourceType
this.iconIdx = i;
this.showInList = show;
}
public String name;
private String name;
public int iconIdx;
public boolean showInList;
public String getName()
{
return LanguageRegistry.instance().getStringLocalization("tb.resource." + this.name);
}
}
@@ -1,8 +1,10 @@
package thaumicbees.item.types;
import cpw.mods.fml.common.registry.LanguageRegistry;
public enum WaxType
{
MAGIC("Magic Wax", false, 0xd242df),
MAGIC("magic", false, 0xd242df),
;
private WaxType(String n, boolean sp, int c)
@@ -12,7 +14,12 @@ public enum WaxType
this.colour = c;
}
public String name;
private String name;
public boolean sparkly;
public int colour;
public String getName()
{
return LanguageRegistry.instance().getStringLocalization("tb.wax." + this.name);
}
}
@@ -8,6 +8,7 @@ public class CommonProxy
{
public static final String TCBEES_GFX = "/gfx/thaumicbees/";
public static final String TCBEES_RESEARCH = "/research/thaumicbees/";
public static final String TCBEES_LOCDIR = "/lang/thaumicbees/";
public static final String TCBEES_ITEM_GFX = TCBEES_GFX + "items/";
public static String FORESTRY_GFX_ITEMS;
+5 -5
View File
@@ -144,7 +144,8 @@ public class Config
try
{
// 0x8700C6 = purpleish.
BackpackDefinition def = new BackpackDefinition("thaumaturge", "Thaumaturge's Backpack", 0x8700C6);
String backpackName = LanguageRegistry.instance().getStringLocalization("tb.backpack.thaumaturge");
BackpackDefinition def = new BackpackDefinition("thaumaturge", backpackName, 0x8700C6);
thaumaturgeBackpackT1 =
BackpackManager.backpackInterface.addBackpack(tbConfig.getItem("thaumaturgePack1", itemIDBase++).getInt(),
def, EnumBackpackType.T1);
@@ -187,11 +188,10 @@ public class Config
itemIDBase++;
itemIDBase++;
// New items here.
jellyBaby = new ItemFood(tbConfig.getItem("sugarSnack", itemIDBase++).getInt(), 1, false).setAlwaysEdible()
// Jelly babies for Dr. Whoniversary.
jellyBaby = new ItemFood(tbConfig.getItem("jellyBabies", itemIDBase++).getInt(), 1, false).setAlwaysEdible()
.setPotionEffect(Potion.moveSpeed.id, 5, 1, 1f);
jellyBaby.setTextureFile(CommonProxy.TCBEES_ITEMS_IMAGE).setIconIndex(19).setItemName("sugarSnack");
LanguageRegistry.addName(jellyBaby, "Jelly Baby");
jellyBaby.setTextureFile(CommonProxy.TCBEES_ITEMS_IMAGE).setIconIndex(19).setItemName("jellyBabies");
}
@@ -5,6 +5,7 @@ import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.ForgeSubscribe;
import thaumicbees.compat.CompatabilityManager;
import thaumicbees.main.utils.CraftingManager;
import thaumicbees.main.utils.LocalizationManager;
import thaumicbees.main.utils.VersionInfo;
import cpw.mods.fml.common.FMLLog;
import cpw.mods.fml.common.Mod;
@@ -41,6 +42,8 @@ public class ThaumicBees
@Mod.PreInit
public void preInit(FMLPreInitializationEvent event)
{
LocalizationManager.setupLocalizationInfo();
this.configsPath = event.getModConfigurationDirectory().getAbsolutePath();
this.modConfig = new Config(event.getSuggestedConfigurationFile());
@@ -86,7 +89,6 @@ public class ThaumicBees
// Forestry has init'd by this point.
MinecraftForge.EVENT_BUS.register(this);
CompatabilityManager.setupResearch();
}
@@ -0,0 +1,28 @@
package thaumicbees.main.utils;
import thaumicbees.main.CommonProxy;
import cpw.mods.fml.common.registry.LanguageRegistry;
public class LocalizationManager
{
private enum Locale
{
en_US("en_US"),
;
public String locale;
private Locale(String loc)
{
this.locale = loc;
}
}
public static void setupLocalizationInfo()
{
for (Locale l : Locale.values())
{
LanguageRegistry.instance().loadLocalization(CommonProxy.TCBEES_LOCDIR + l.locale + ".xml", l.locale, true);
}
}
}
@@ -1,5 +1,6 @@
package thaumicbees.main.utils;
import cpw.mods.fml.common.registry.LanguageRegistry;
import net.minecraft.world.World;
/**
@@ -7,14 +8,20 @@ import net.minecraft.world.World;
*/
public enum MoonPhase
{
FULL,
WANING_GIBBOUS,
WANING_HALF,
WANING_CRESCENT,
NEW,
WAXING_CRESCENT,
WAXING_HALF,
WAXING_GIBBOUS;
FULL("full"),
WANING_GIBBOUS("gibbousWaning"),
WANING_HALF("halfWaning"),
WANING_CRESCENT("crescentWaning"),
NEW("new"),
WAXING_CRESCENT("crecentWaxing"),
WAXING_HALF("halfWaxing"),
WAXING_GIBBOUS("gibbousWaxing");
private String phaseName;
private MoonPhase(String name)
{
this.phaseName = name;
}
public boolean isBetween(MoonPhase first, MoonPhase second)
{
@@ -35,6 +42,11 @@ public enum MoonPhase
return flag;
}
public String getName()
{
return LanguageRegistry.instance().getStringLocalization("tb.moon." + this.phaseName);
}
public static MoonPhase getMoonPhase(World w)
{
return MoonPhase.values()[(int)((w.getWorldTime() - 0) / 24000L) % 8];