mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-19 11:59:11 +00:00
Removed LanguageManager
Added I18N static class Some code reformatting
This commit is contained in:
1 parent
1ffe80b8c9
commit
186cbda444
62 files changed
+360
-375
No files matched your search
@@ -1,7 +1,7 @@
|
||||
package binnie.core.circuits;
|
||||
|
||||
import binnie.Binnie;
|
||||
import binnie.core.AbstractMod;
|
||||
import binnie.core.util.I18N;
|
||||
import forestry.api.circuits.ChipsetManager;
|
||||
import forestry.api.circuits.CircuitSocketType;
|
||||
import forestry.api.circuits.ICircuitLayout;
|
||||
@@ -24,12 +24,12 @@ public class BinnieCircuitLayout implements ICircuitLayout {
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
return Binnie.I18N.localise(mod, "circuit.layout." + uid.toLowerCase());
|
||||
return I18N.localise(mod, "circuit.layout." + uid.toLowerCase());
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getUsage() {
|
||||
return Binnie.I18N.localise(mod, "circuit.layout." + uid.toLowerCase() + ".usage");
|
||||
return I18N.localise(mod, "circuit.layout." + uid.toLowerCase() + ".usage");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -20,6 +20,7 @@ import binnie.core.craftgui.resource.minecraft.CraftGUITexture;
|
||||
import binnie.core.craftgui.resource.minecraft.PaddedTexture;
|
||||
import binnie.core.craftgui.resource.minecraft.StandardTexture;
|
||||
import binnie.core.machines.inventory.SlotValidator;
|
||||
import binnie.core.util.I18N;
|
||||
import binnie.extrabees.core.ExtraBeeTexture;
|
||||
import binnie.extrabees.gui.punnett.ExtraBeeGUITexture;
|
||||
import binnie.genetics.gui.ControlChromosome;
|
||||
@@ -194,8 +195,8 @@ public class WindowFieldKit extends Window {
|
||||
List<String> infos = new ArrayList<>();
|
||||
|
||||
int i = 0;
|
||||
for (String pref = root.getUID() + ".fieldkit." + type.getName().toLowerCase() + "."; Binnie.I18N.canLocalise(pref + i); ++i) {
|
||||
infos.add(Binnie.I18N.localise(pref + i));
|
||||
for (String pref = root.getUID() + ".fieldkit." + type.getName().toLowerCase() + "."; I18N.canLocalise(pref + i); ++i) {
|
||||
infos.add(I18N.localise(pref + i));
|
||||
}
|
||||
|
||||
String text = Binnie.Genetics.getSystem(root).getAlleleName(type, allele);
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
package binnie.core.craftgui.database;
|
||||
|
||||
import binnie.Binnie;
|
||||
import binnie.core.AbstractMod;
|
||||
import binnie.core.craftgui.ITooltipHelp;
|
||||
import binnie.core.craftgui.Tooltip;
|
||||
import binnie.core.util.I18N;
|
||||
|
||||
public class DatabaseTab implements ITooltipHelp {
|
||||
private AbstractMod mod;
|
||||
@@ -18,11 +18,11 @@ public class DatabaseTab implements ITooltipHelp {
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return Binnie.I18N.localise(mod, "gui.database.tab." + unloc);
|
||||
return I18N.localise(mod, "gui.database.tab." + unloc);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getHelpTooltip(Tooltip tooltip) {
|
||||
tooltip.add(Binnie.I18N.localiseOrBlank(mod, "gui.database.tab." + unloc + ".help"));
|
||||
tooltip.add(I18N.localiseOrBlank(mod, "gui.database.tab." + unloc + ".help"));
|
||||
}
|
||||
}
|
||||
@@ -2,6 +2,7 @@ package binnie.core.genetics;
|
||||
|
||||
import binnie.Binnie;
|
||||
import binnie.core.BinnieCore;
|
||||
import binnie.core.util.I18N;
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import forestry.api.apiculture.EnumBeeChromosome;
|
||||
import forestry.api.apiculture.EnumBeeType;
|
||||
@@ -56,16 +57,16 @@ class BeeBreedingSystem extends BreedingSystem {
|
||||
public String getAlleleName(IChromosomeType chromosome, IAllele allele) {
|
||||
if (chromosome == EnumBeeChromosome.FERTILITY) {
|
||||
if (allele.getUID().contains("Low")) {
|
||||
return Binnie.I18N.localise(BinnieCore.instance, "allele.fertility.low");
|
||||
return I18N.localise(BinnieCore.instance, "allele.fertility.low");
|
||||
}
|
||||
if (allele.getUID().contains("Normal")) {
|
||||
return Binnie.I18N.localise(BinnieCore.instance, "allele.fertility.normal");
|
||||
return I18N.localise(BinnieCore.instance, "allele.fertility.normal");
|
||||
}
|
||||
if (allele.getUID().contains("High")) {
|
||||
return Binnie.I18N.localise(BinnieCore.instance, "allele.fertility.high");
|
||||
return I18N.localise(BinnieCore.instance, "allele.fertility.high");
|
||||
}
|
||||
if (allele.getUID().contains("Maximum")) {
|
||||
return Binnie.I18N.localise(BinnieCore.instance, "allele.fertility.maximum");
|
||||
return I18N.localise(BinnieCore.instance, "allele.fertility.maximum");
|
||||
}
|
||||
}
|
||||
return super.getAlleleName(chromosome, allele);
|
||||
|
||||
@@ -3,6 +3,7 @@ package binnie.core.genetics;
|
||||
import binnie.Binnie;
|
||||
import binnie.core.BinnieCore;
|
||||
import binnie.core.resource.BinnieIcon;
|
||||
import binnie.core.util.I18N;
|
||||
import binnie.extrabees.genetics.ExtraBeeMutation;
|
||||
import com.mojang.authlib.GameProfile;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
@@ -421,11 +422,11 @@ public abstract class BreedingSystem implements IItemStackRepresentative {
|
||||
public String getAlleleName(IChromosomeType chromosome, IAllele allele) {
|
||||
if (allele instanceof IAlleleBoolean) {
|
||||
return ((IAlleleBoolean) allele).getValue() ?
|
||||
Binnie.I18N.localise(BinnieCore.instance, "allele.true") :
|
||||
Binnie.I18N.localise(BinnieCore.instance, "allele.false");
|
||||
I18N.localise(BinnieCore.instance, "allele.true") :
|
||||
I18N.localise(BinnieCore.instance, "allele.false");
|
||||
}
|
||||
if (allele.getName() == "for.gui.maximum") {
|
||||
return Binnie.I18N.localise(BinnieCore.instance, "allele.fertility.maximum");
|
||||
if (allele.getName().equals("for.gui.maximum")) {
|
||||
return I18N.localise(BinnieCore.instance, "allele.fertility.maximum");
|
||||
}
|
||||
return allele.getName();
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package binnie.core.genetics;
|
||||
|
||||
import binnie.Binnie;
|
||||
import binnie.core.BinnieCore;
|
||||
import binnie.core.util.I18N;
|
||||
|
||||
public enum EnumBeeModifier {
|
||||
Territory,
|
||||
@@ -12,6 +12,6 @@ public enum EnumBeeModifier {
|
||||
GeneticDecay;
|
||||
|
||||
public String getName() {
|
||||
return Binnie.I18N.localise(BinnieCore.instance, "beemodifier." + name().toLowerCase());
|
||||
return I18N.localise(BinnieCore.instance, "beemodifier." + name().toLowerCase());
|
||||
}
|
||||
}
|
||||
@@ -8,6 +8,7 @@ import binnie.botany.api.IFlowerRoot;
|
||||
import binnie.botany.core.BotanyCore;
|
||||
import binnie.botany.genetics.EnumFlowerColor;
|
||||
import binnie.core.BinnieCore;
|
||||
import binnie.core.util.I18N;
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import forestry.api.genetics.IAllele;
|
||||
import forestry.api.genetics.IBreedingTracker;
|
||||
@@ -50,16 +51,16 @@ class FlowerBreedingSystem extends BreedingSystem {
|
||||
public String getAlleleName(IChromosomeType chromosome, IAllele allele) {
|
||||
if (chromosome == EnumFlowerChromosome.FERTILITY) {
|
||||
if (allele.getUID().contains("Low")) {
|
||||
return Binnie.I18N.localise(BinnieCore.instance, "allele.fertility.low");
|
||||
return I18N.localise(BinnieCore.instance, "allele.fertility.low");
|
||||
}
|
||||
if (allele.getUID().contains("Normal")) {
|
||||
return Binnie.I18N.localise(BinnieCore.instance, "allele.fertility.normal");
|
||||
return I18N.localise(BinnieCore.instance, "allele.fertility.normal");
|
||||
}
|
||||
if (allele.getUID().contains("High")) {
|
||||
return Binnie.I18N.localise(BinnieCore.instance, "allele.fertility.high");
|
||||
return I18N.localise(BinnieCore.instance, "allele.fertility.high");
|
||||
}
|
||||
if (allele.getUID().contains("Maximum")) {
|
||||
return Binnie.I18N.localise(BinnieCore.instance, "allele.fertility.maximum");
|
||||
return I18N.localise(BinnieCore.instance, "allele.fertility.maximum");
|
||||
}
|
||||
}
|
||||
return super.getAlleleName(chromosome, allele);
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package binnie.core.genetics;
|
||||
|
||||
import binnie.Binnie;
|
||||
import binnie.core.BinnieCore;
|
||||
import binnie.core.util.I18N;
|
||||
import forestry.api.genetics.AlleleManager;
|
||||
import forestry.api.genetics.IAlleleSpecies;
|
||||
import forestry.api.genetics.IClassification;
|
||||
@@ -35,7 +35,7 @@ interface IBreedingMessage {
|
||||
|
||||
@Override
|
||||
public String getTitle() {
|
||||
return Binnie.I18N.localise(BinnieCore.instance, "gui.breedingmessage.species");
|
||||
return I18N.localise(BinnieCore.instance, "gui.breedingmessage.species");
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -70,7 +70,7 @@ interface IBreedingMessage {
|
||||
|
||||
@Override
|
||||
public String getTitle() {
|
||||
return Binnie.I18N.localise(BinnieCore.instance, "gui.breedingmessage.branch");
|
||||
return I18N.localise(BinnieCore.instance, "gui.breedingmessage.branch");
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -95,7 +95,7 @@ interface IBreedingMessage {
|
||||
|
||||
@Override
|
||||
public String getTitle() {
|
||||
return Binnie.I18N.localise(BinnieCore.instance, "gui.breedingmessage.epithet");
|
||||
return I18N.localise(BinnieCore.instance, "gui.breedingmessage.epithet");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -2,6 +2,7 @@ package binnie.core.genetics;
|
||||
|
||||
import binnie.Binnie;
|
||||
import binnie.core.BinnieCore;
|
||||
import binnie.core.util.I18N;
|
||||
import binnie.extratrees.ExtraTrees;
|
||||
import forestry.api.genetics.IAllele;
|
||||
import forestry.api.genetics.IAlleleInteger;
|
||||
@@ -49,24 +50,24 @@ class MothBreedingSystem extends BreedingSystem {
|
||||
if (chromosome == EnumButterflyChromosome.METABOLISM) {
|
||||
int metabolism = ((IAlleleInteger) allele).getValue();
|
||||
if (metabolism >= 19) {
|
||||
return Binnie.I18N.localise(BinnieCore.instance, "allele.metabolism.highest");
|
||||
return I18N.localise(BinnieCore.instance, "allele.metabolism.highest");
|
||||
}
|
||||
if (metabolism >= 16) {
|
||||
return Binnie.I18N.localise(BinnieCore.instance, "allele.metabolism.higher");
|
||||
return I18N.localise(BinnieCore.instance, "allele.metabolism.higher");
|
||||
}
|
||||
if (metabolism >= 13) {
|
||||
return Binnie.I18N.localise(BinnieCore.instance, "allele.metabolism.high");
|
||||
return I18N.localise(BinnieCore.instance, "allele.metabolism.high");
|
||||
}
|
||||
if (metabolism >= 10) {
|
||||
return Binnie.I18N.localise(BinnieCore.instance, "allele.metabolism.normal");
|
||||
return I18N.localise(BinnieCore.instance, "allele.metabolism.normal");
|
||||
}
|
||||
if (metabolism >= 7) {
|
||||
return Binnie.I18N.localise(BinnieCore.instance, "allele.metabolism.slow");
|
||||
return I18N.localise(BinnieCore.instance, "allele.metabolism.slow");
|
||||
}
|
||||
if (metabolism >= 4) {
|
||||
return Binnie.I18N.localise(BinnieCore.instance, "allele.metabolism.slower");
|
||||
return I18N.localise(BinnieCore.instance, "allele.metabolism.slower");
|
||||
}
|
||||
return Binnie.I18N.localise(BinnieCore.instance, "allele.metabolism.slowest");
|
||||
return I18N.localise(BinnieCore.instance, "allele.metabolism.slowest");
|
||||
}
|
||||
if (chromosome == EnumButterflyChromosome.FERTILITY) {
|
||||
return ((IAlleleInteger) allele).getValue() + "x";
|
||||
|
||||
@@ -2,6 +2,7 @@ package binnie.core.genetics;
|
||||
|
||||
import binnie.Binnie;
|
||||
import binnie.core.BinnieCore;
|
||||
import binnie.core.util.I18N;
|
||||
import binnie.core.util.UniqueItemStackSet;
|
||||
import binnie.extratrees.ExtraTrees;
|
||||
import binnie.extratrees.FakeWorld;
|
||||
@@ -87,24 +88,24 @@ public class TreeBreedingSystem extends BreedingSystem {
|
||||
|
||||
if (chromosome == EnumTreeChromosome.PLANT) {
|
||||
EnumSet<EnumPlantType> types = ((IAllelePlantType) allele).getPlantTypes();
|
||||
return types.isEmpty() ?
|
||||
Binnie.I18N.localise(BinnieCore.instance, "allele.none") :
|
||||
types.iterator().next().toString();
|
||||
return types.isEmpty()
|
||||
? I18N.localise(BinnieCore.instance, "allele.none")
|
||||
: types.iterator().next().toString();
|
||||
}
|
||||
|
||||
if (chromosome == EnumTreeChromosome.FRUITS && allele.getUID().contains(".")) {
|
||||
IFruitProvider provider = ((IAlleleFruit) allele).getProvider();
|
||||
return (provider.getProducts().length == 0) ?
|
||||
Binnie.I18N.localise(BinnieCore.instance, "allele.none") :
|
||||
provider.getProducts()[0].getDisplayName();
|
||||
return (provider.getProducts().length == 0)
|
||||
? I18N.localise(BinnieCore.instance, "allele.none")
|
||||
: provider.getProducts()[0].getDisplayName();
|
||||
}
|
||||
|
||||
if (chromosome == EnumTreeChromosome.GROWTH) {
|
||||
if (allele.getUID().contains("Tropical")) {
|
||||
return Binnie.I18N.localise(BinnieCore.instance, "allele.growth.tropical");
|
||||
return I18N.localise(BinnieCore.instance, "allele.growth.tropical");
|
||||
}
|
||||
if (allele.getUID().contains("Lightlevel")) {
|
||||
return Binnie.I18N.localise(BinnieCore.instance, "allele.growth.lightlevel");
|
||||
return I18N.localise(BinnieCore.instance, "allele.growth.lightlevel");
|
||||
}
|
||||
}
|
||||
return super.getAlleleName(chromosome, allele);
|
||||
|
||||
@@ -1,57 +0,0 @@
|
||||
package binnie.core.language;
|
||||
|
||||
import binnie.core.AbstractMod;
|
||||
import binnie.core.ManagerBase;
|
||||
import net.minecraft.util.StatCollector;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
public class ManagerLanguage extends ManagerBase {
|
||||
private Map<Object, String> objNames;
|
||||
|
||||
public ManagerLanguage() {
|
||||
objNames = new HashMap<>();
|
||||
}
|
||||
|
||||
public void addObjectName(Object obj, String name) {
|
||||
objNames.put(obj, name);
|
||||
}
|
||||
|
||||
public String unlocalised(AbstractMod mod, String id) {
|
||||
return mod.getModID() + "." + id;
|
||||
}
|
||||
|
||||
public String localise(Object key) {
|
||||
String loc = StatCollector.translateToLocal(key.toString());
|
||||
if (loc.equals(key.toString())) {
|
||||
if (objNames.containsKey(key)) {
|
||||
return localise(objNames.get(key));
|
||||
}
|
||||
return key.toString();
|
||||
}
|
||||
return loc;
|
||||
}
|
||||
|
||||
public String localise(AbstractMod mod, String id) {
|
||||
return localise(unlocalised(mod, id));
|
||||
}
|
||||
|
||||
public String localiseOrBlank(AbstractMod mod, String id) {
|
||||
return localiseOrBlank(unlocalised(mod, id));
|
||||
}
|
||||
|
||||
public String localise(AbstractMod mod, String id, Object... objs) {
|
||||
return String.format(localise(mod, id), objs);
|
||||
}
|
||||
|
||||
public String localiseOrBlank(Object key) {
|
||||
String trans = localise(key);
|
||||
return trans.equals(key) ? "" : trans;
|
||||
}
|
||||
|
||||
public boolean canLocalise(Object key) {
|
||||
String trans = localise(key);
|
||||
return !trans.equals(key);
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
package binnie.core.machines;
|
||||
|
||||
import binnie.Binnie;
|
||||
import binnie.core.util.I18N;
|
||||
import net.minecraft.client.renderer.RenderBlocks;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
|
||||
@@ -27,7 +27,7 @@ public abstract class MachinePackage {
|
||||
public abstract TileEntity createTileEntity();
|
||||
|
||||
public String getDisplayName() {
|
||||
return Binnie.I18N.localise(group.getMod(), "machine." + group.getShortUID() + "." + getUID());
|
||||
return I18N.localise(group.getMod(), "machine." + group.getShortUID() + "." + getUID());
|
||||
}
|
||||
|
||||
public Integer getMetadata() {
|
||||
@@ -57,6 +57,6 @@ public abstract class MachinePackage {
|
||||
}
|
||||
|
||||
public String getInformation() {
|
||||
return Binnie.I18N.localise(group.getMod(), "machine." + group.getShortUID() + "." + getUID() + ".info");
|
||||
return I18N.localise(group.getMod(), "machine." + group.getShortUID() + "." + getUID() + ".info");
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
package binnie.core.machines.inventory;
|
||||
|
||||
import binnie.Binnie;
|
||||
import binnie.core.BinnieCore;
|
||||
import binnie.core.util.I18N;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
|
||||
@@ -92,7 +92,7 @@ public class InventorySlot extends BaseSlot<ItemStack> {
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
return Binnie.I18N.localise(BinnieCore.instance, "gui.slot." + unlocName);
|
||||
return I18N.localise(BinnieCore.instance, "gui.slot." + unlocName);
|
||||
}
|
||||
|
||||
public enum Type {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package binnie.core.machines.inventory;
|
||||
|
||||
import binnie.Binnie;
|
||||
import binnie.core.BinnieCore;
|
||||
import binnie.core.util.I18N;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.fluids.FluidTank;
|
||||
@@ -48,6 +48,6 @@ public class TankSlot extends BaseSlot<FluidStack> {
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
return Binnie.I18N.localise(BinnieCore.instance, "gui.slot." + unlocName);
|
||||
return I18N.localise(BinnieCore.instance, "gui.slot." + unlocName);
|
||||
}
|
||||
}
|
||||
@@ -1,10 +1,10 @@
|
||||
package binnie.core.proxy;
|
||||
|
||||
import binnie.Binnie;
|
||||
import binnie.core.AbstractMod;
|
||||
import binnie.core.BinnieCore;
|
||||
import binnie.core.gui.IBinnieGUID;
|
||||
import binnie.core.network.packet.MessageBase;
|
||||
import binnie.core.util.I18N;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
@@ -60,10 +60,10 @@ public class BinnieModProxy implements IBinnieModProxy {
|
||||
}
|
||||
|
||||
public String localise(String string) {
|
||||
return Binnie.I18N.localise(mod, string);
|
||||
return I18N.localise(mod, string);
|
||||
}
|
||||
|
||||
public String localiseOrBlank(String string) {
|
||||
return Binnie.I18N.localiseOrBlank(mod, string);
|
||||
return I18N.localiseOrBlank(mod, string);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,35 @@
|
||||
package binnie.core.util;
|
||||
|
||||
import binnie.core.AbstractMod;
|
||||
import net.minecraft.util.StatCollector;
|
||||
|
||||
public class I18N {
|
||||
public static String unlocalised(AbstractMod mod, String id) {
|
||||
return mod.getModID() + "." + id;
|
||||
}
|
||||
|
||||
public static String localise(String key) {
|
||||
return StatCollector.translateToLocal(key.toString());
|
||||
}
|
||||
|
||||
public static String localise(AbstractMod mod, String id) {
|
||||
return localise(unlocalised(mod, id));
|
||||
}
|
||||
|
||||
public static String localiseOrBlank(AbstractMod mod, String id) {
|
||||
return localiseOrBlank(unlocalised(mod, id));
|
||||
}
|
||||
|
||||
public static String localise(AbstractMod mod, String id, Object... objs) {
|
||||
return String.format(localise(mod, id), objs);
|
||||
}
|
||||
|
||||
public static String localiseOrBlank(String key) {
|
||||
String trans = localise(key);
|
||||
return trans.equals(key) ? "" : trans;
|
||||
}
|
||||
|
||||
public static boolean canLocalise(String key) {
|
||||
return !localise(key).equals(key);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user