Removed LanguageManager

Added I18N static class
Some code reformatting
This commit is contained in:
kordum committed 2017-05-09 20:07:11 +03:00
1 parent 1ffe80b8c9
commit 186cbda444
62 files changed
+360 -375

No files matched your search

@@ -115,15 +115,11 @@ public class FakeWorld extends World {
/**
* Creating objects without calling constructors.
*/
public static <T> T create(Class<T> clazz,
Class<? super T> parent) {
public static <T> T create(Class<T> clazz, Class<? super T> parent) {
try {
ReflectionFactory rf =
ReflectionFactory.getReflectionFactory();
ReflectionFactory rf = ReflectionFactory.getReflectionFactory();
Constructor objDef = parent.getDeclaredConstructor();
Constructor intConstr = rf.newConstructorForSerialization(
clazz, objDef
);
Constructor intConstr = rf.newConstructorForSerialization(clazz, objDef);
return clazz.cast(intConstr.newInstance());
} catch (RuntimeException e) {
throw e;
@@ -1,6 +1,6 @@
package binnie.extratrees.alcohol;
import binnie.Binnie;
import binnie.core.util.I18N;
import binnie.extratrees.ExtraTrees;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.item.ItemStack;
@@ -41,7 +41,7 @@ public enum Glassware {
if (liquid == null) {
return ExtraTrees.proxy.localise("item.glassware." + name().toLowerCase());
}
return Binnie.I18N.localise(ExtraTrees.instance, "item.glassware." + name().toLowerCase() + ".usage", liquid);
return I18N.localise(ExtraTrees.instance, "item.glassware." + name().toLowerCase() + ".usage", liquid);
}
public int getCapacity() {
@@ -1,9 +1,9 @@
package binnie.extratrees.block;
import binnie.Binnie;
import binnie.core.block.BlockMetadata;
import binnie.core.block.IBlockMetadata;
import binnie.core.block.TileEntityMetadata;
import binnie.core.util.I18N;
import binnie.extratrees.ExtraTrees;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -194,9 +194,9 @@ public class BlockETDoor extends BlockDoor implements IBlockMetadata {
String typeName = getDoorType(meta).getName();
String woodName = WoodManager.getPlankType(meta & 0xFF).getName();
if (typeName.equals("")) {
return Binnie.I18N.localise(ExtraTrees.instance, "block.door.name", woodName);
return I18N.localise(ExtraTrees.instance, "block.door.name", woodName);
}
return Binnie.I18N.localise(ExtraTrees.instance, "block.door.name.adv", woodName, typeName);
return I18N.localise(ExtraTrees.instance, "block.door.name.adv", woodName, typeName);
}
@Override
@@ -1,9 +1,9 @@
package binnie.extratrees.block;
import binnie.Binnie;
import binnie.core.block.BlockMetadata;
import binnie.core.block.IBlockMetadata;
import binnie.core.block.TileEntityMetadata;
import binnie.core.util.I18N;
import binnie.extratrees.ExtraTrees;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -129,7 +129,7 @@ public class BlockETLog extends BlockLog implements IBlockMetadata {
@Override
public String getBlockName(ItemStack itemStack) {
int meta = TileEntityMetadata.getItemDamage(itemStack);
return Binnie.I18N.localise(ExtraTrees.instance, "block.log.name", ILogType.ExtraTreeLog.values()[meta].getName());
return I18N.localise(ExtraTrees.instance, "block.log.name", ILogType.ExtraTreeLog.values()[meta].getName());
}
@Override
@@ -1,9 +1,9 @@
package binnie.extratrees.block;
import binnie.Binnie;
import binnie.core.block.BlockMetadata;
import binnie.core.block.IBlockMetadata;
import binnie.core.block.TileEntityMetadata;
import binnie.core.util.I18N;
import binnie.extratrees.ExtraTrees;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -74,7 +74,7 @@ public class BlockETPlanks extends BlockWood implements IBlockMetadata {
@Override
public String getBlockName(ItemStack itemStack) {
int meta = TileEntityMetadata.getItemDamage(itemStack);
return Binnie.I18N.localise(ExtraTrees.instance, "block.plank.name", PlankType.ExtraTreePlanks.values()[meta].getName());
return I18N.localise(ExtraTrees.instance, "block.plank.name", PlankType.ExtraTreePlanks.values()[meta].getName());
}
@Override
@@ -1,9 +1,9 @@
package binnie.extratrees.block;
import binnie.Binnie;
import binnie.core.block.BlockMetadata;
import binnie.core.block.IBlockMetadata;
import binnie.core.block.TileEntityMetadata;
import binnie.core.util.I18N;
import binnie.extratrees.ExtraTrees;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -82,7 +82,7 @@ public class BlockETSlab extends BlockWoodSlab implements IBlockMetadata {
@Override
public String getBlockName(ItemStack itemStack) {
int meta = TileEntityMetadata.getItemDamage(itemStack);
return Binnie.I18N.localise(ExtraTrees.instance, "block.woodslab.name", PlankType.ExtraTreePlanks.values()[meta].getName());
return I18N.localise(ExtraTrees.instance, "block.woodslab.name", PlankType.ExtraTreePlanks.values()[meta].getName());
}
@Override
@@ -1,9 +1,9 @@
package binnie.extratrees.block;
import binnie.Binnie;
import binnie.core.block.BlockMetadata;
import binnie.core.block.IBlockMetadata;
import binnie.core.block.TileEntityMetadata;
import binnie.core.util.I18N;
import binnie.extratrees.ExtraTrees;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -106,7 +106,7 @@ public class BlockETStairs extends BlockStairs implements IBlockMetadata {
@Override
public String getBlockName(ItemStack itemStack) {
int meta = TileEntityMetadata.getItemDamage(itemStack);
return Binnie.I18N.localise(ExtraTrees.instance, "block.woodstairs.name", WoodManager.getPlankType(meta + 32).getName());
return I18N.localise(ExtraTrees.instance, "block.woodstairs.name", WoodManager.getPlankType(meta + 32).getName());
}
@Override
@@ -1,10 +1,10 @@
package binnie.extratrees.block.decor;
import binnie.Binnie;
import binnie.core.Mods;
import binnie.core.block.BlockMetadata;
import binnie.core.block.IBlockMetadata;
import binnie.core.block.TileEntityMetadata;
import binnie.core.util.I18N;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.block.IFenceProvider;
import binnie.extratrees.block.PlankType;
@@ -121,7 +121,7 @@ public class BlockFence extends net.minecraft.block.BlockFence implements IBlock
@Override
public String getBlockName(ItemStack itemStack) {
int meta = TileEntityMetadata.getItemDamage(itemStack);
return Binnie.I18N.localise(ExtraTrees.instance, "block.woodfence.name", getDescription(meta).getPlankType().getName());
return I18N.localise(ExtraTrees.instance, "block.woodfence.name", getDescription(meta).getPlankType().getName());
}
@Override
@@ -1,9 +1,9 @@
package binnie.extratrees.block.decor;
import binnie.Binnie;
import binnie.core.block.BlockMetadata;
import binnie.core.block.IBlockMetadata;
import binnie.core.block.TileEntityMetadata;
import binnie.core.util.I18N;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.block.IPlankType;
import binnie.extratrees.block.WoodManager;
@@ -104,7 +104,7 @@ public class BlockGate extends BlockFenceGate implements IBlockMetadata {
@Override
public String getBlockName(ItemStack itemStack) {
int meta = TileEntityMetadata.getItemDamage(itemStack);
return Binnie.I18N.localise(ExtraTrees.instance, "block.woodgate.name", WoodManager.getPlankType(meta).getName());
return I18N.localise(ExtraTrees.instance, "block.woodgate.name", WoodManager.getPlankType(meta).getName());
}
@Override
@@ -1,8 +1,8 @@
package binnie.extratrees.block.decor;
import binnie.Binnie;
import binnie.core.block.IBlockMetadata;
import binnie.core.block.TileEntityMetadata;
import binnie.core.util.I18N;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.block.IPlankType;
import binnie.extratrees.block.PlankType;
@@ -40,6 +40,6 @@ public class BlockMultiFence extends BlockFence implements IBlockMetadata {
IPlankType type2 = getDescription(meta).getSecondaryPlankType();
boolean twoTypes = type1 != type2;
FenceType type3 = getDescription(meta).getFenceType();
return Binnie.I18N.localise(ExtraTrees.instance, "block.woodslab.name" + (twoTypes ? "2" : ""), type3.getPrefix(), type1.getName(), type2.getName());
return I18N.localise(ExtraTrees.instance, "block.woodslab.name" + (twoTypes ? "2" : ""), type3.getPrefix(), type1.getName(), type2.getName());
}
}
@@ -1,6 +1,6 @@
package binnie.extratrees.carpentry;
import binnie.Binnie;
import binnie.core.util.I18N;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.api.IDesign;
import binnie.extratrees.block.PlankType;
@@ -26,7 +26,7 @@ public class BlockCarpentry extends BlockDesign {
@Override
public String getBlockName(DesignBlock design) {
return Binnie.I18N.localise(ExtraTrees.instance, "block.woodentile.name", design.getDesign().getName());
return I18N.localise(ExtraTrees.instance, "block.woodentile.name", design.getDesign().getName());
}
}
@@ -1,8 +1,8 @@
package binnie.extratrees.carpentry;
import binnie.Binnie;
import binnie.core.block.BlockMetadata;
import binnie.core.block.TileEntityMetadata;
import binnie.core.util.I18N;
import binnie.extratrees.ExtraTrees;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -85,7 +85,7 @@ public class BlockCarpentryPanel extends BlockCarpentry {
@Override
public String getBlockName(ItemStack stack) {
DesignBlock block = ModuleCarpentry.getDesignBlock(getDesignSystem(), TileEntityMetadata.getItemDamage(stack));
return Binnie.I18N.localise(ExtraTrees.instance, "block.woodenpanel.name", block.getDesign().getName());
return I18N.localise(ExtraTrees.instance, "block.woodenpanel.name", block.getDesign().getName());
}
@Override
@@ -1,7 +1,7 @@
package binnie.extratrees.carpentry;
import binnie.Binnie;
import binnie.botany.Botany;
import binnie.core.util.I18N;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.api.IDesign;
import cpw.mods.fml.relauncher.Side;
@@ -59,6 +59,6 @@ public class BlockStainedDesign extends BlockDesign {
@Override
public String getBlockName(DesignBlock design) {
return Binnie.I18N.localise(ExtraTrees.instance, "block.stainedglass.name", design.getDesign().getName());
return I18N.localise(ExtraTrees.instance, "block.stainedglass.name", design.getDesign().getName());
}
}
@@ -1,6 +1,5 @@
package binnie.extratrees.craftgui.dictionary;
import binnie.Binnie;
import binnie.core.BinnieCore;
import binnie.core.craftgui.CraftGUI;
import binnie.core.craftgui.ITooltip;
@@ -16,6 +15,7 @@ import binnie.core.craftgui.geometry.IPoint;
import binnie.core.craftgui.minecraft.Window;
import binnie.core.craftgui.resource.minecraft.CraftGUITexture;
import binnie.core.machines.TileEntityMachine;
import binnie.core.util.I18N;
import binnie.extratrees.api.CarpentryManager;
import binnie.extratrees.api.IDesign;
import binnie.extratrees.api.IDesignCategory;
@@ -144,7 +144,7 @@ public class ControlTileSelect extends Control implements IControlValue<IDesign>
@Override
public void getTooltip(Tooltip tooltip) {
tooltip.add(Binnie.I18N.localise(BinnieCore.instance, "gui.designer.pattern", getValue().getName()));
tooltip.add(I18N.localise(BinnieCore.instance, "gui.designer.pattern", getValue().getName()));
}
@Override