diff --git a/thaumicbees_res/build.number b/thaumicbees_res/build.number index 39900b6..01d41b0 100644 --- a/thaumicbees_res/build.number +++ b/thaumicbees_res/build.number @@ -1,3 +1,3 @@ #Build Number for ANT. Do not edit! -#Sat Feb 09 14:11:48 PST 2013 -build.number=114 +#Fri Feb 15 12:43:48 PST 2013 +build.number=119 diff --git a/thaumicbees_res/build.xml b/thaumicbees_res/build.xml index 81b1627..1e85d8e 100644 --- a/thaumicbees_res/build.xml +++ b/thaumicbees_res/build.xml @@ -17,7 +17,7 @@ - + diff --git a/thaumicbees_res/changelog.txt b/thaumicbees_res/changelog.txt index 983ff4c..5866418 100644 --- a/thaumicbees_res/changelog.txt +++ b/thaumicbees_res/changelog.txt @@ -1,3 +1,47 @@ +1.4.0a +Fixed some issues with the Node bee's effect. + +1.4.0 +New branch of bees containing 3 new species. A new type of frame! +Thaumaturge's Backpack now require Amber rather than Gold Nuggets. +Due to popular complaint, the Bees & Magic node now requires Unified Thaumic Field Theory to unlock. +Moving all kinds of string contstants out of code into Localization files. +Also fixed crazy aspects showing up on things that shouldn't have those aspects. + +1.3.0d +Fixed an issue with mutations requiring a non-specific type of node to fail. + +1.3.0c +Discovered a function call that will crash dedicated servers. If you are running ThuamicBees on a server, please update to this revision. + +1.3.0b +Fixed a problem with capsules not being registered with the Forge Liquid Dictionary. You should be able to use them just about everywhere, now. +Fixed the issue with certain items appearing twice in Creative Mode tabs. + +1.3.0a +Some bug fixes, including uncommenting some mutation-related code, research tweaking. +Added the last bee for a long while, probably. Good luck getting it. Posted Image + +Common TB crashes stemming from Forestry issues should now be reported a little better, especially the backpack registration & item texture file related things. Errors should appear in your log, so make sure you read the log before you report the error here. It could be something silly on your end that is causing the crash. + +1.3.0 +3 new species of bee: Vis, Pure, and Flux! Each requires an aura node nearby, and may have some side-effects... +New Thaumcraft research! Open up your Thaumanomicon to see it. +New Apiary Frames! They run off magic, confers bees with bonuses, and may have an impact outside of your apiary... + +1.2.705B - Replaced 1.2.705 +Fixed issue with bad Mutation class, allowing pure bees to turn into any bee that involves them in a mutation. +Also ACTUALLY fixed issue with Extra Bees loading after ThaumicBees on *nix-based systems. + +1.2.705 +*Stealth update: Fixed an issue with TB loading before Extra Bees, resulting in some Null Pointers getting passed and choked on. If you get this issue, please re-download 1.2.705. No other changes were made in this version. + +*8 new species of bees, including "Praecantatio", which, like the other Elemental bees, may contain Vis shards in its propolis. Some of the new species may also have extra evil involved, so be ready for anything. +*Extra integration with Extra Bees! Mutations for some of the new bees. If Extra Bees is present, their mutations will require EB species rather than the base Forestry species. +*Changed the "Charmed" mutation to avoid conflicting with Extra Bees. (Binnie already had one there, so mine got moved.) +*New bee branch, similar to Extra Bees's mob spawning bees. +*One new bee from a new branch, the rest of which will come once Azanor releases the Thaumcraft API. + 1.1.702-67 - Replaced 1.1.702-62 Additional Magic Capsules, featuring ExtraBees liquids, and RailCraft Creosote & Steam. (Yes, steam capsules. It's magic. That's how. :P) Tagged additional Forestry items with Thaumcraft aspects. diff --git a/thaumicbees_res/lang/thaumicbees/en_US.xml b/thaumicbees_res/lang/thaumicbees/en_US.xml index e6098d0..84c69fc 100644 --- a/thaumicbees_res/lang/thaumicbees/en_US.xml +++ b/thaumicbees_res/lang/thaumicbees/en_US.xml @@ -165,25 +165,18 @@ Arcane - Arcanus Supernatural - Coeleste Scholarly - Docto Thaumic - Thaumis Skulking - Malevolens Vis - Patabilis Time - Sempiternus diff --git a/thaumicbees_src/thaumicbees/bees/AlleleEffect.java b/thaumicbees_src/thaumicbees/bees/AlleleEffect.java index 18cc5ff..1ae6634 100644 --- a/thaumicbees_src/thaumicbees/bees/AlleleEffect.java +++ b/thaumicbees_src/thaumicbees/bees/AlleleEffect.java @@ -9,6 +9,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; import thaumicbees.main.ThaumicBees; +import thaumicbees.main.utils.LocalizationManager; import forestry.api.apiculture.IAlleleBeeEffect; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; @@ -34,7 +35,7 @@ public abstract class AlleleEffect extends Allele implements IAlleleBeeEffect @Override public String getIdentifier() { - return LanguageRegistry.instance().getStringLocalization(getUID()); + return LocalizationManager.getLocalizedString(getUID()); } @Override diff --git a/thaumicbees_src/thaumicbees/bees/AlleleEffectAuraNodeGrow.java b/thaumicbees_src/thaumicbees/bees/AlleleEffectAuraNodeGrow.java index e070b7e..ef6af74 100644 --- a/thaumicbees_src/thaumicbees/bees/AlleleEffectAuraNodeGrow.java +++ b/thaumicbees_src/thaumicbees/bees/AlleleEffectAuraNodeGrow.java @@ -39,7 +39,7 @@ public class AlleleEffectAuraNodeGrow extends AlleleEffect if (value >= throttle) { World w = housing.getWorld(); - if (w.rand.nextInt(15) < 1) + if (w.rand.nextInt(10) < 1) { float x = housing.getXCoord(); float y = housing.getYCoord(); @@ -48,7 +48,7 @@ public class AlleleEffectAuraNodeGrow extends AlleleEffect if (nodeId != -1) { AuraNode node = ThaumcraftApi.getNodeCopy(nodeId); - if (node.level >= node.baseLevel * 3 / 4) + if (node.level >= node.baseLevel * 4 / 5) { x = (float)(x - node.xPos); y = (float)(y - node.yPos); @@ -59,11 +59,11 @@ public class AlleleEffectAuraNodeGrow extends AlleleEffect y = y / distance; z = z / distance; - x *= 0.0125f; - y *= 0.0125f; - z *= 0.0125f; + x *= 0.05f; + y *= 0.05f; + z *= 0.05f; - ThaumcraftApi.queueNodeChanges(nodeId, node.baseLevel * -3 / 10, w.rand.nextInt(1), false, null, x, y, z); + ThaumcraftApi.queueNodeChanges(nodeId, node.baseLevel * -1 / 13, w.rand.nextInt(2), false, null, x, y, z); } } } diff --git a/thaumicbees_src/thaumicbees/bees/BeeClassification.java b/thaumicbees_src/thaumicbees/bees/BeeClassification.java index 03d4336..f8af328 100644 --- a/thaumicbees_src/thaumicbees/bees/BeeClassification.java +++ b/thaumicbees_src/thaumicbees/bees/BeeClassification.java @@ -2,6 +2,8 @@ package thaumicbees.bees; import java.util.ArrayList; +import thaumicbees.main.utils.LocalizationManager; + import cpw.mods.fml.common.registry.LanguageRegistry; import forestry.api.genetics.AlleleManager; @@ -10,23 +12,25 @@ import forestry.api.genetics.IClassification; public enum BeeClassification implements IClassification { - ARCANE("Arcane"), - SUPERNATURAL("Supernatural"), - SCHOLARLY("Scholarly"), - THAUMIC("Thaumic"), - SKULKING("Skulking"), - VIS("Vis"), - TIME("Time"), + ARCANE("Arcane", "Arcanus"), + SUPERNATURAL("Supernatural", ""), + SCHOLARLY("Scholarly", ""), + THAUMIC("Thaumic", ""), + SKULKING("Skulking", ""), + VIS("Vis", ""), + TIME("Time", ""), ; private String uID; + private String latin; private ArrayList species; private IClassification parent; private EnumClassLevel level; - private BeeClassification(String name) + private BeeClassification(String name, String scientific) { this.uID = "classification." + name.toLowerCase(); + this.latin = scientific; this.level = EnumClassLevel.GENUS; this.species = new ArrayList(); this.parent = AlleleManager.alleleRegistry.getClassification("family.apidae"); @@ -48,19 +52,19 @@ public enum BeeClassification implements IClassification @Override public String getName() { - return LanguageRegistry.instance().getStringLocalization(getUID()); + return LocalizationManager.getLocalizedString(getUID()); } @Override public String getScientific() { - return LanguageRegistry.instance().getStringLocalization(getUID() + ".latin"); + return this.latin; } @Override public String getDescription() { - return LanguageRegistry.instance().getStringLocalization(getUID() + ".description"); + return LocalizationManager.getLocalizedString(getUID() + ".description"); } @Override diff --git a/thaumicbees_src/thaumicbees/bees/BeeSpecies.java b/thaumicbees_src/thaumicbees/bees/BeeSpecies.java index a77135e..162a2cd 100644 --- a/thaumicbees_src/thaumicbees/bees/BeeSpecies.java +++ b/thaumicbees_src/thaumicbees/bees/BeeSpecies.java @@ -18,6 +18,7 @@ import thaumicbees.item.types.DropType; import thaumicbees.item.types.PollenType; import thaumicbees.item.types.ResourceType; import thaumicbees.main.Config; +import thaumicbees.main.utils.LocalizationManager; import net.minecraft.block.Block; import net.minecraft.item.Item; @@ -273,12 +274,12 @@ public enum BeeSpecies implements IAlleleBeeSpecies public String getName() { - return LanguageRegistry.instance().getStringLocalization(getUID()); + return LocalizationManager.getLocalizedString(getUID()); } public String getDescription() { - return LanguageRegistry.instance().getStringLocalization(getUID() + ".description"); + return LocalizationManager.getLocalizedString(getUID() + ".description"); } public int getBodyType() diff --git a/thaumicbees_src/thaumicbees/bees/FlowerProviderAuraNode.java b/thaumicbees_src/thaumicbees/bees/FlowerProviderAuraNode.java index 6ef2828..58b51ae 100644 --- a/thaumicbees_src/thaumicbees/bees/FlowerProviderAuraNode.java +++ b/thaumicbees_src/thaumicbees/bees/FlowerProviderAuraNode.java @@ -4,6 +4,7 @@ import cpw.mods.fml.common.registry.LanguageRegistry; import thaumcraft.api.AuraNode; import thaumcraft.api.ThaumcraftApi; import thaumicbees.main.Config; +import thaumicbees.main.utils.LocalizationManager; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.world.World; @@ -45,7 +46,7 @@ public class FlowerProviderAuraNode implements IFlowerProvider @Override public String getDescription() { - return LanguageRegistry.instance().getStringLocalization("tb.bees.flower.node"); + return LocalizationManager.getLocalizedString("tb.bees.flower.node"); } @Override diff --git a/thaumicbees_src/thaumicbees/bees/FlowerProviderAuraNodeFlux.java b/thaumicbees_src/thaumicbees/bees/FlowerProviderAuraNodeFlux.java index 0b7b121..cf7acfe 100644 --- a/thaumicbees_src/thaumicbees/bees/FlowerProviderAuraNodeFlux.java +++ b/thaumicbees_src/thaumicbees/bees/FlowerProviderAuraNodeFlux.java @@ -4,6 +4,7 @@ import cpw.mods.fml.common.registry.LanguageRegistry; import thaumcraft.api.EnumTag; import thaumcraft.api.ObjectTags; import thaumcraft.api.ThaumcraftApi; +import thaumicbees.main.utils.LocalizationManager; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import forestry.api.apiculture.IBeeGenome; @@ -38,6 +39,6 @@ public class FlowerProviderAuraNodeFlux extends FlowerProviderAuraNode @Override public String getDescription() { - return LanguageRegistry.instance().getStringLocalization("tb.bees.flower.nodeFlux"); + return LocalizationManager.getLocalizedString("tb.bees.flower.nodeFlux"); } } diff --git a/thaumicbees_src/thaumicbees/bees/FlowerProviderAuraNodePurify.java b/thaumicbees_src/thaumicbees/bees/FlowerProviderAuraNodePurify.java index 2eaf18e..a27d901 100644 --- a/thaumicbees_src/thaumicbees/bees/FlowerProviderAuraNodePurify.java +++ b/thaumicbees_src/thaumicbees/bees/FlowerProviderAuraNodePurify.java @@ -9,6 +9,7 @@ import thaumcraft.api.EnumTag; import thaumcraft.api.ObjectTags; import thaumcraft.api.ThaumcraftApi; import thaumicbees.main.Config; +import thaumicbees.main.utils.LocalizationManager; import forestry.api.apiculture.IBeeGenome; public class FlowerProviderAuraNodePurify extends FlowerProviderAuraNode @@ -22,7 +23,7 @@ public class FlowerProviderAuraNodePurify extends FlowerProviderAuraNode @Override public String getDescription() { - return LanguageRegistry.instance().getStringLocalization("tb.bees.flower.nodePure"); + return LocalizationManager.getLocalizedString("tb.bees.flower.nodePure"); } @Override diff --git a/thaumicbees_src/thaumicbees/bees/FlowerProviderBookshelf.java b/thaumicbees_src/thaumicbees/bees/FlowerProviderBookshelf.java index c73067d..594c676 100644 --- a/thaumicbees_src/thaumicbees/bees/FlowerProviderBookshelf.java +++ b/thaumicbees_src/thaumicbees/bees/FlowerProviderBookshelf.java @@ -1,5 +1,6 @@ package thaumicbees.bees; +import thaumicbees.main.utils.LocalizationManager; import cpw.mods.fml.common.registry.LanguageRegistry; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; @@ -47,6 +48,6 @@ public class FlowerProviderBookshelf implements IFlowerProvider public String getDescription() { - return LanguageRegistry.instance().getStringLocalization("tb.bees.flower.book"); + return LocalizationManager.getLocalizedString("tb.bees.flower.book"); } } diff --git a/thaumicbees_src/thaumicbees/bees/FlowerProviderThaumcraftFlower.java b/thaumicbees_src/thaumicbees/bees/FlowerProviderThaumcraftFlower.java index 0a83c87..2b3ac42 100644 --- a/thaumicbees_src/thaumicbees/bees/FlowerProviderThaumcraftFlower.java +++ b/thaumicbees_src/thaumicbees/bees/FlowerProviderThaumcraftFlower.java @@ -2,6 +2,7 @@ package thaumicbees.bees; import cpw.mods.fml.common.registry.LanguageRegistry; import thaumicbees.main.Config; +import thaumicbees.main.utils.LocalizationManager; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.world.World; @@ -45,7 +46,7 @@ public class FlowerProviderThaumcraftFlower implements IFlowerProvider @Override public String getDescription() { - return LanguageRegistry.instance().getStringLocalization("tb.bees.flower.magic"); + return LocalizationManager.getLocalizedString("tb.bees.flower.magic"); } @Override diff --git a/thaumicbees_src/thaumicbees/compat/CompatabilityManager.java b/thaumicbees_src/thaumicbees/compat/CompatabilityManager.java index 48509f5..ae47659 100644 --- a/thaumicbees_src/thaumicbees/compat/CompatabilityManager.java +++ b/thaumicbees_src/thaumicbees/compat/CompatabilityManager.java @@ -58,7 +58,8 @@ 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."); + FMLLog.warning("Could not get Extra Bees item: " + field + ". If you notice this, please report this on the Thaumic Bees thread with the following trace:"); + e.printStackTrace(); } return value; } diff --git a/thaumicbees_src/thaumicbees/item/ItemPollen.java b/thaumicbees_src/thaumicbees/item/ItemPollen.java index f473be8..dccd127 100644 --- a/thaumicbees_src/thaumicbees/item/ItemPollen.java +++ b/thaumicbees_src/thaumicbees/item/ItemPollen.java @@ -80,7 +80,7 @@ public class ItemPollen extends Item return colour; } - + @Override public String getItemDisplayName(ItemStack stack) { diff --git a/thaumicbees_src/thaumicbees/item/ItemSolidFlux.java b/thaumicbees_src/thaumicbees/item/ItemSolidFlux.java index 8a68985..63024bd 100644 --- a/thaumicbees_src/thaumicbees/item/ItemSolidFlux.java +++ b/thaumicbees_src/thaumicbees/item/ItemSolidFlux.java @@ -41,7 +41,7 @@ public class ItemSolidFlux extends Item @Override public String getItemDisplayName(ItemStack stack) { - return String.format(LanguageRegistry.instance().getStringLocalization("tb.resource.crystalFlux"), EnumTag.get(stack.getItemDamage()).name); + return String.format(LocalizationManager.getLocalizedString("tb.resource.crystalFlux"), EnumTag.get(stack.getItemDamage()).name); } @Override diff --git a/thaumicbees_src/thaumicbees/item/types/CapsuleType.java b/thaumicbees_src/thaumicbees/item/types/CapsuleType.java index 80efe96..12b1796 100644 --- a/thaumicbees_src/thaumicbees/item/types/CapsuleType.java +++ b/thaumicbees_src/thaumicbees/item/types/CapsuleType.java @@ -1,5 +1,6 @@ package thaumicbees.item.types; +import thaumicbees.main.utils.LocalizationManager; import cpw.mods.fml.common.registry.LanguageRegistry; public enum CapsuleType @@ -19,6 +20,6 @@ public enum CapsuleType public String getName() { - return LanguageRegistry.instance().getStringLocalization("tb.capsule." + name); + return LocalizationManager.getLocalizedString("tb.capsule." + name); } } \ No newline at end of file diff --git a/thaumicbees_src/thaumicbees/item/types/CombType.java b/thaumicbees_src/thaumicbees/item/types/CombType.java index 2e80262..7d154bb 100644 --- a/thaumicbees_src/thaumicbees/item/types/CombType.java +++ b/thaumicbees_src/thaumicbees/item/types/CombType.java @@ -1,5 +1,6 @@ package thaumicbees.item.types; +import thaumicbees.main.utils.LocalizationManager; import cpw.mods.fml.common.registry.LanguageRegistry; public enum CombType @@ -33,6 +34,6 @@ public enum CombType public String getName() { - return LanguageRegistry.instance().getStringLocalization("tb.comb." + this.name); + return LocalizationManager.getLocalizedString("tb.comb." + this.name); } } \ No newline at end of file diff --git a/thaumicbees_src/thaumicbees/item/types/DropType.java b/thaumicbees_src/thaumicbees/item/types/DropType.java index a1da8cb..08a3f7b 100644 --- a/thaumicbees_src/thaumicbees/item/types/DropType.java +++ b/thaumicbees_src/thaumicbees/item/types/DropType.java @@ -1,5 +1,6 @@ package thaumicbees.item.types; +import thaumicbees.main.utils.LocalizationManager; import cpw.mods.fml.common.registry.LanguageRegistry; public enum DropType @@ -20,6 +21,6 @@ public enum DropType public String getName() { - return LanguageRegistry.instance().getStringLocalization("tb.drop." + this.name); + return LocalizationManager.getLocalizedString("tb.drop." + this.name); } } \ No newline at end of file diff --git a/thaumicbees_src/thaumicbees/item/types/HiveFrameType.java b/thaumicbees_src/thaumicbees/item/types/HiveFrameType.java index 32da4ba..7e0abe1 100644 --- a/thaumicbees_src/thaumicbees/item/types/HiveFrameType.java +++ b/thaumicbees_src/thaumicbees/item/types/HiveFrameType.java @@ -3,6 +3,7 @@ package thaumicbees.item.types; import cpw.mods.fml.common.registry.LanguageRegistry; import thaumcraft.api.EnumTag; import thaumcraft.api.ObjectTags; +import thaumicbees.main.utils.LocalizationManager; public enum HiveFrameType { @@ -69,6 +70,6 @@ public enum HiveFrameType public String getName() { - return LanguageRegistry.instance().getStringLocalization("tb.frame." + this.frameName); + return LocalizationManager.getLocalizedString("tb.frame." + this.frameName); } } diff --git a/thaumicbees_src/thaumicbees/item/types/LiquidType.java b/thaumicbees_src/thaumicbees/item/types/LiquidType.java index d70e661..76d2fce 100644 --- a/thaumicbees_src/thaumicbees/item/types/LiquidType.java +++ b/thaumicbees_src/thaumicbees/item/types/LiquidType.java @@ -1,5 +1,6 @@ package thaumicbees.item.types; +import thaumicbees.main.utils.LocalizationManager; import cpw.mods.fml.common.registry.LanguageRegistry; import net.minecraftforge.liquids.LiquidDictionary; @@ -51,6 +52,6 @@ public enum LiquidType public String getDisplayName() { - return LanguageRegistry.instance().getStringLocalization("tb.liquid." + liquidID); + return LocalizationManager.getLocalizedString("tb.liquid." + liquidID); } } diff --git a/thaumicbees_src/thaumicbees/item/types/PollenType.java b/thaumicbees_src/thaumicbees/item/types/PollenType.java index e25df2a..3873bdb 100644 --- a/thaumicbees_src/thaumicbees/item/types/PollenType.java +++ b/thaumicbees_src/thaumicbees/item/types/PollenType.java @@ -1,5 +1,6 @@ package thaumicbees.item.types; +import thaumicbees.main.utils.LocalizationManager; import cpw.mods.fml.common.registry.LanguageRegistry; public enum PollenType @@ -19,6 +20,6 @@ public enum PollenType public String getName() { - return LanguageRegistry.instance().getStringLocalization("tb.pollen." + this.name); + return LocalizationManager.getLocalizedString("tb.pollen." + this.name); } } \ No newline at end of file diff --git a/thaumicbees_src/thaumicbees/item/types/PropolisType.java b/thaumicbees_src/thaumicbees/item/types/PropolisType.java index a96577b..fefa0c5 100644 --- a/thaumicbees_src/thaumicbees/item/types/PropolisType.java +++ b/thaumicbees_src/thaumicbees/item/types/PropolisType.java @@ -1,5 +1,6 @@ package thaumicbees.item.types; +import thaumicbees.main.utils.LocalizationManager; import cpw.mods.fml.common.registry.LanguageRegistry; public enum PropolisType @@ -23,6 +24,6 @@ public enum PropolisType public String getName() { - return LanguageRegistry.instance().getStringLocalization("tb.propolis." + this.name); + return LocalizationManager.getLocalizedString("tb.propolis." + this.name); } } diff --git a/thaumicbees_src/thaumicbees/item/types/ResourceType.java b/thaumicbees_src/thaumicbees/item/types/ResourceType.java index dbc8b9b..5a53ce1 100644 --- a/thaumicbees_src/thaumicbees/item/types/ResourceType.java +++ b/thaumicbees_src/thaumicbees/item/types/ResourceType.java @@ -1,5 +1,6 @@ package thaumicbees.item.types; +import thaumicbees.main.utils.LocalizationManager; import cpw.mods.fml.common.registry.LanguageRegistry; public enum ResourceType @@ -26,6 +27,6 @@ public enum ResourceType public String getName() { - return LanguageRegistry.instance().getStringLocalization("tb.resource." + this.name); + return LocalizationManager.getLocalizedString("tb.resource." + this.name); } } diff --git a/thaumicbees_src/thaumicbees/item/types/WaxType.java b/thaumicbees_src/thaumicbees/item/types/WaxType.java index 8fc2513..8120948 100644 --- a/thaumicbees_src/thaumicbees/item/types/WaxType.java +++ b/thaumicbees_src/thaumicbees/item/types/WaxType.java @@ -1,5 +1,6 @@ package thaumicbees.item.types; +import thaumicbees.main.utils.LocalizationManager; import cpw.mods.fml.common.registry.LanguageRegistry; public enum WaxType @@ -20,6 +21,6 @@ public enum WaxType public String getName() { - return LanguageRegistry.instance().getStringLocalization("tb.wax." + this.name); + return LocalizationManager.getLocalizedString("tb.wax." + this.name); } } \ No newline at end of file diff --git a/thaumicbees_src/thaumicbees/main/Config.java b/thaumicbees_src/thaumicbees/main/Config.java index b167e39..ac7bc5d 100644 --- a/thaumicbees_src/thaumicbees/main/Config.java +++ b/thaumicbees_src/thaumicbees/main/Config.java @@ -17,6 +17,7 @@ import thaumicbees.item.ItemSolidFlux; import thaumicbees.item.ItemWax; import thaumicbees.item.types.CapsuleType; import thaumicbees.item.types.HiveFrameType; +import thaumicbees.main.utils.LocalizationManager; import thaumicbees.storage.BackpackDefinition; import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.event.FMLInterModComms; @@ -144,7 +145,7 @@ public class Config try { // 0x8700C6 = purpleish. - String backpackName = LanguageRegistry.instance().getStringLocalization("tb.backpack.thaumaturge"); + String backpackName = LocalizationManager.getLocalizedString("tb.backpack.thaumaturge"); BackpackDefinition def = new BackpackDefinition("thaumaturge", backpackName, 0x8700C6); thaumaturgeBackpackT1 = BackpackManager.backpackInterface.addBackpack(tbConfig.getItem("thaumaturgePack1", itemIDBase++).getInt(), diff --git a/thaumicbees_src/thaumicbees/main/utils/LocalizationManager.java b/thaumicbees_src/thaumicbees/main/utils/LocalizationManager.java index f9e37e5..b8d7c41 100644 --- a/thaumicbees_src/thaumicbees/main/utils/LocalizationManager.java +++ b/thaumicbees_src/thaumicbees/main/utils/LocalizationManager.java @@ -1,5 +1,6 @@ package thaumicbees.main.utils; +import net.minecraft.util.StringTranslate; import thaumicbees.main.CommonProxy; import cpw.mods.fml.common.registry.LanguageRegistry; @@ -25,4 +26,13 @@ public class LocalizationManager } } + public static String getLocalizedString(String key) + { + String result = LanguageRegistry.instance().getStringLocalization(key); + if (result.isEmpty()) + { + result = LanguageRegistry.instance().getStringLocalization(key, "en_US"); + } + return result; + } } diff --git a/thaumicbees_src/thaumicbees/main/utils/MoonPhase.java b/thaumicbees_src/thaumicbees/main/utils/MoonPhase.java index aa63b02..e7237bf 100644 --- a/thaumicbees_src/thaumicbees/main/utils/MoonPhase.java +++ b/thaumicbees_src/thaumicbees/main/utils/MoonPhase.java @@ -44,7 +44,7 @@ public enum MoonPhase public String getName() { - return LanguageRegistry.instance().getStringLocalization("tb.moon." + this.phaseName); + return LocalizationManager.getLocalizedString("tb.moon." + this.phaseName); } public static MoonPhase getMoonPhase(World w)