[1.7.10] Added some localization (#86)

* Added some localization
us_GB lang files cleanup

* Fix compile errors

* Some refactoring

* Added some localization
Some refactoring
This commit is contained in:
Alexander Kornilov authored and mezz committed 2017-06-02 22:50:03 -07:00
1 parent 0c15ee9943
commit 2f683650c0
125 files changed
+962 -2572

No files matched your search

@@ -67,11 +67,11 @@ public class ModuleBlocks implements IInitializable {
OreDictionary.registerOre("plankWood", plank2.getStack());
}
FMLInterModComms.sendMessage("Forestry", "add-fence-block", "ExtraTrees:fence");
FMLInterModComms.sendMessage("Forestry", "add-fence-block", "ExtraTrees:gate");
// FMLInterModComms.sendMessage("Forestry", "add-alveary-slab",
FMLInterModComms.sendMessage("FORESTRY", "add-fence-block", "ExtraTrees:fence");
FMLInterModComms.sendMessage("FORESTRY", "add-fence-block", "ExtraTrees:gate");
// FMLInterModComms.sendMessage("FORESTRY", "add-alveary-slab",
// "ExtraTrees:slab");
FMLInterModComms.sendMessage("Forestry", "add-fence-block", "ExtraTrees:multifence");
FMLInterModComms.sendMessage("FORESTRY", "add-fence-block", "ExtraTrees:multifence");
ModuleBlocks.hedgeRenderID = BinnieCore.proxy.getUniqueRenderID();
}
@@ -133,7 +133,7 @@ public class ModuleBlocks implements IInitializable {
public void addSqueezer(ILogType log, ILiquidType liquid, int amount, float pulpChance) {
FluidStack liquidStack = liquid.get(amount);
RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{log.getItemStack()}, liquidStack, Mods.Forestry.stack("woodPulp"), (int) (100.0f * pulpChance));
RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{log.getItemStack()}, liquidStack, Mods.forestry.stack("woodPulp"), (int) (100.0f * pulpChance));
}
public void addSqueezer(ILogType log, ILiquidType liquid, int amount) {
@@ -204,7 +204,7 @@ public class PlankType {
@Override
public ItemStack getStack() {
Item stack = Mods.Forestry.item("planks");
Item stack = Mods.forestry.item("planks");
return new ItemStack(stack, 1, ordinal());
}
@@ -220,7 +220,7 @@ public class PlankType {
@Override
public ItemStack getFence() {
ItemStack fence = Mods.Forestry.stack("fences");
ItemStack fence = Mods.forestry.stack("fences");
fence.setItemDamage(ordinal());
return fence;
}
@@ -42,7 +42,7 @@ public class BlockFence extends net.minecraft.block.BlockFence implements IBlock
}
public static boolean canConnect(Block block) {
return block == ((ItemBlock) Mods.Forestry.item("fences")).field_150939_a || block == Blocks.fence || block == Blocks.fence_gate || block == Blocks.nether_brick_fence || block instanceof IBlockFence || block == ExtraTrees.blockGate;
return block == ((ItemBlock) Mods.forestry.item("fences")).field_150939_a || block == Blocks.fence || block == Blocks.fence_gate || block == Blocks.nether_brick_fence || block instanceof IBlockFence || block == ExtraTrees.blockGate;
}
@Override
@@ -8,7 +8,7 @@ import binnie.core.mod.config.PropBoolean;
public class ConfigurationMain {
@ConfigProperty(
key = "lemon.citrus.family",
comment = {"Uses reflection to convert the Forestry lemon tree to the Citrus family."}
comment = {"Uses reflection to convert the FORESTRY lemon tree to the Citrus family."}
)
@PropBoolean
public static boolean alterLemon = true;
@@ -26,7 +26,7 @@ public class ControlBreweryProgress extends ControlProgressBase {
protected ControlBreweryProgress(IWidget parent, float x, float y) {
super(parent, x, y, 34.0f, 39.0f);
addAttribute(WidgetAttribute.MouseOver);
addAttribute(WidgetAttribute.MOUSE_OVER);
}
@Override
@@ -23,7 +23,7 @@ public class ControlFruitPressProgress extends ControlProgressBase {
protected ControlFruitPressProgress(IWidget parent, float x, float y) {
super(parent, x, y, 37.0f, 69.0f);
addAttribute(WidgetAttribute.MouseOver);
addAttribute(WidgetAttribute.MOUSE_OVER);
addSelfEventHandler(new EventMouse.Down.Handler() {
@Override
public void onEvent(EventMouse.Down event) {
@@ -126,7 +126,7 @@ public class ControlTileSelect extends Control implements IControlValue<IDesign>
protected ControlTile(IWidget parent, float x, float y, IDesign value) {
super(parent, x, y, 18.0f, 18.0f);
setValue(value);
addAttribute(WidgetAttribute.MouseOver);
addAttribute(WidgetAttribute.MOUSE_OVER);
addSelfEventHandler(new EventMouse.Down.Handler() {
@Override
public void onEvent(EventMouse.Down event) {
@@ -23,6 +23,6 @@ public class PageSpeciesImage extends PageSpecies {
@Override
public void onValueChanged(IAlleleSpecies species) {
display.setSpecies(species, EnumDiscoveryState.Show);
display.setSpecies(species, EnumDiscoveryState.SHOW);
}
}
@@ -38,15 +38,15 @@ public class WindowArboristDatabase extends WindowAbstractDatabase {
@Override
protected void addTabs() {
new PageSpeciesOverview(getInfoPages(Mode.Species), new DatabaseTab(ExtraTrees.instance, "species.overview", 0));
new PageSpeciesTreeGenome(getInfoPages(Mode.Species), new DatabaseTab(ExtraTrees.instance, "species.genome", 0));
new PageSpeciesClassification(getInfoPages(Mode.Species), new DatabaseTab(ExtraTrees.instance, "species.classification", 0));
new PageSpeciesResultant(getInfoPages(Mode.Species), new DatabaseTab(ExtraTrees.instance, "species.resultant", 0));
new PageSpeciesMutations(getInfoPages(Mode.Species), new DatabaseTab(ExtraTrees.instance, "species.further", 0));
new PageBranchOverview(getInfoPages(Mode.Branches), new DatabaseTab(ExtraTrees.instance, "branches.overview", 0));
new PageBranchSpecies(getInfoPages(Mode.Branches), new DatabaseTab(ExtraTrees.instance, "branches.species", 0));
new PageBreeder(getInfoPages(Mode.Breeder), getUsername(), new DatabaseTab(ExtraTrees.instance, "breeder", 0));
createMode(TreeMode.Fruit, new ModeWidgets(TreeMode.Fruit, this) {
new PageSpeciesOverview(getInfoPages(Mode.Species), new DatabaseTab(ExtraTrees.instance, "species.overview"));
new PageSpeciesTreeGenome(getInfoPages(Mode.Species), new DatabaseTab(ExtraTrees.instance, "species.genome"));
new PageSpeciesClassification(getInfoPages(Mode.Species), new DatabaseTab(ExtraTrees.instance, "species.classification"));
new PageSpeciesResultant(getInfoPages(Mode.Species), new DatabaseTab(ExtraTrees.instance, "species.resultant"));
new PageSpeciesMutations(getInfoPages(Mode.Species), new DatabaseTab(ExtraTrees.instance, "species.further"));
new PageBranchOverview(getInfoPages(Mode.Branches), new DatabaseTab(ExtraTrees.instance, "branches.overview"));
new PageBranchSpecies(getInfoPages(Mode.Branches), new DatabaseTab(ExtraTrees.instance, "branches.species"));
new PageBreeder(getInfoPages(Mode.Breeder), getUsername(), new DatabaseTab(ExtraTrees.instance, "breeder"));
createMode(TreeMode.FRUIT, new ModeWidgets(TreeMode.FRUIT, this) {
@Override
public void createListBox(IArea area) {
(listBox = new ControlListBox<ItemStack>(modePage, area.x(), area.y(), area.w(), area.h(), 12.0f) {
@@ -57,7 +57,7 @@ public class WindowArboristDatabase extends WindowAbstractDatabase {
}).setOptions(((TreeBreedingSystem) getBreedingSystem()).allFruits);
}
});
createMode(TreeMode.Wood, new ModeWidgets(TreeMode.Wood, this) {
createMode(TreeMode.WOOD, new ModeWidgets(TreeMode.WOOD, this) {
@Override
public void createListBox(IArea area) {
(listBox = new ControlListBox<ItemStack>(modePage, area.x(), area.y(), area.w(), area.h(), 12.0f) {
@@ -68,7 +68,7 @@ public class WindowArboristDatabase extends WindowAbstractDatabase {
}).setOptions(((TreeBreedingSystem) getBreedingSystem()).allWoods);
}
});
createMode(TreeMode.Planks, new ModeWidgets(TreeMode.Planks, this) {
createMode(TreeMode.PLANKS, new ModeWidgets(TreeMode.PLANKS, this) {
@Override
public void createListBox(IArea area) {
listBox = new ControlListBox<ItemStack>(modePage, area.x(), area.y(), area.w(), area.h(), 12.0f) {
@@ -79,11 +79,11 @@ public class WindowArboristDatabase extends WindowAbstractDatabase {
};
}
});
new PageFruit(getInfoPages(TreeMode.Fruit), new DatabaseTab(ExtraTrees.instance, "fruit.natural", 0), true);
new PageFruit(getInfoPages(TreeMode.Fruit), new DatabaseTab(ExtraTrees.instance, "fruit.potential", 0), false);
new PageWood(getInfoPages(TreeMode.Wood), new DatabaseTab(ExtraTrees.instance, "wood.natural", 0));
new PagePlanksOverview(getInfoPages(TreeMode.Planks), new DatabaseTab(ExtraTrees.instance, "planks.overview", 0));
new PagePlanksTrees(getInfoPages(TreeMode.Planks), new DatabaseTab(ExtraTrees.instance, "planks.natural", 1));
new PageFruit(getInfoPages(TreeMode.FRUIT), new DatabaseTab(ExtraTrees.instance, "fruit.natural"), true);
new PageFruit(getInfoPages(TreeMode.FRUIT), new DatabaseTab(ExtraTrees.instance, "fruit.potential"), false);
new PageWood(getInfoPages(TreeMode.WOOD), new DatabaseTab(ExtraTrees.instance, "wood.natural"));
new PagePlanksOverview(getInfoPages(TreeMode.PLANKS), new DatabaseTab(ExtraTrees.instance, "planks.overview"));
new PagePlanksTrees(getInfoPages(TreeMode.PLANKS), new DatabaseTab(ExtraTrees.instance, "planks.natural"));
}
@Override
@@ -97,9 +97,9 @@ public class WindowArboristDatabase extends WindowAbstractDatabase {
}
enum TreeMode implements IDatabaseMode {
Fruit,
Wood,
Planks;
FRUIT,
WOOD,
PLANKS;
@Override
public String getName() {
@@ -27,14 +27,14 @@ public class WindowLepidopteristDatabase extends WindowAbstractDatabase {
@Override
protected void addTabs() {
new PageSpeciesOverview(getInfoPages(Mode.Species), new DatabaseTab(ExtraTrees.instance, "butterfly.species.overview", 0));
new PageSpeciesClassification(getInfoPages(Mode.Species), new DatabaseTab(ExtraTrees.instance, "butterfly.species.classification", 0));
new PageSpeciesImage(getInfoPages(Mode.Species), new DatabaseTab(ExtraTrees.instance, "butterfly.species.specimen", 0));
new PageSpeciesResultant(getInfoPages(Mode.Species), new DatabaseTab(ExtraTrees.instance, "butterfly.species.resultant", 0));
new PageSpeciesMutations(getInfoPages(Mode.Species), new DatabaseTab(ExtraTrees.instance, "butterfly.species.further", 0));
new PageBranchOverview(getInfoPages(Mode.Branches), new DatabaseTab(ExtraTrees.instance, "butterfly.branches.overview", 0));
new PageBranchSpecies(getInfoPages(Mode.Branches), new DatabaseTab(ExtraTrees.instance, "butterfly.branches.species", 0));
new PageBreeder(getInfoPages(Mode.Breeder), getUsername(), new DatabaseTab(ExtraTrees.instance, "butterfly.breeder", 0));
new PageSpeciesOverview(getInfoPages(Mode.Species), new DatabaseTab(ExtraTrees.instance, "butterfly.species.overview"));
new PageSpeciesClassification(getInfoPages(Mode.Species), new DatabaseTab(ExtraTrees.instance, "butterfly.species.classification"));
new PageSpeciesImage(getInfoPages(Mode.Species), new DatabaseTab(ExtraTrees.instance, "butterfly.species.specimen"));
new PageSpeciesResultant(getInfoPages(Mode.Species), new DatabaseTab(ExtraTrees.instance, "butterfly.species.resultant"));
new PageSpeciesMutations(getInfoPages(Mode.Species), new DatabaseTab(ExtraTrees.instance, "butterfly.species.further"));
new PageBranchOverview(getInfoPages(Mode.Branches), new DatabaseTab(ExtraTrees.instance, "butterfly.branches.overview"));
new PageBranchSpecies(getInfoPages(Mode.Branches), new DatabaseTab(ExtraTrees.instance, "butterfly.branches.species"));
new PageBreeder(getInfoPages(Mode.Breeder), getUsername(), new DatabaseTab(ExtraTrees.instance, "butterfly.breeder"));
}
@Override
@@ -11,6 +11,6 @@ public class ControlDropDownMenu extends Panel {
public ControlDropDownMenu(IWidget parent, float x, float y, float width, float height) {
super(parent, x, y, width, 2.0f, MinecraftGUI.PanelType.Gray);
stayOpenOnChildClick = false;
addAttribute(WidgetAttribute.CanFocus);
addAttribute(WidgetAttribute.CAN_FOCUS);
}
}
@@ -38,7 +38,7 @@ public class ControlFluidDisplay extends Control implements ITooltip {
public void setTooltip() {
hastooltip = true;
addAttribute(WidgetAttribute.MouseOver);
addAttribute(WidgetAttribute.MOUSE_OVER);
}
@Override
@@ -22,7 +22,7 @@ public class ControlSlotFluid extends Control implements ITooltip {
public ControlSlotFluid(IWidget parent, int x, int y, int size, FluidStack fluid) {
super(parent, x, y, size, size);
addAttribute(WidgetAttribute.MouseOver);
addAttribute(WidgetAttribute.MOUSE_OVER);
itemDisplay = new ControlFluidDisplay(this, 1.0f, 1.0f, size - 2);
fluidStack = fluid;
addSelfEventHandler(new EventWidget.ChangeSize.Handler() {
@@ -205,13 +205,13 @@ public enum ButterflySpecies implements IAlleleButterflySpecies {
}
}
if (itemstack.getItem() == Mods.Forestry.item("honeyDrop")) {
if (itemstack.getItem() == Mods.forestry.item("honeyDrop")) {
return 0.5f;
}
if (itemstack.getItem() == Mods.Forestry.item("honeydew")) {
if (itemstack.getItem() == Mods.forestry.item("honeydew")) {
return 0.7f;
}
if (itemstack.getItem() == Mods.Forestry.item("beeComb")) {
if (itemstack.getItem() == Mods.forestry.item("beeComb")) {
return 0.4f;
}
if (AlleleManager.alleleRegistry.isIndividual(itemstack)) {
@@ -1301,13 +1301,13 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm
}
}
if (itemstack.getItem() == Mods.Forestry.item("honeyDrop")) {
if (itemstack.getItem() == Mods.forestry.item("honeyDrop")) {
return 0.5f;
}
if (itemstack.getItem() == Mods.Forestry.item("honeydew")) {
if (itemstack.getItem() == Mods.forestry.item("honeydew")) {
return 0.7f;
}
if (itemstack.getItem() == Mods.Forestry.item("beeComb")) {
if (itemstack.getItem() == Mods.forestry.item("beeComb")) {
return 0.4f;
}
if (AlleleManager.alleleRegistry.isIndividual(itemstack)) {
@@ -177,7 +177,7 @@ public enum Food implements IItemMisc {
time,
new ItemStack[]{get(1)},
Binnie.Liquid.getLiquidStack("juice", amount),
Mods.Forestry.stack("mulch"),
Mods.forestry.stack("mulch"),
mulch
);
}
@@ -187,7 +187,7 @@ public enum Food implements IItemMisc {
time,
new ItemStack[]{get(1)},
Binnie.Liquid.getLiquidStack("juice", amount),
Mods.Forestry.stack("mulch"),
Mods.forestry.stack("mulch"),
mulch
);
}
@@ -197,7 +197,7 @@ public enum Food implements IItemMisc {
time,
new ItemStack[]{get(1)},
Binnie.Liquid.getLiquidStack("seedoil", amount),
Mods.Forestry.stack("mulch"),
Mods.forestry.stack("mulch"),
mulch
);
}
@@ -172,7 +172,7 @@ public class ModuleItems implements IInitializable {
GameRegistry.addRecipe(
ExtraTreeItems.ProvenGear.get(1),
" s ", "s s", " s ",
's', Mods.Forestry.stack("oakStick")
's', Mods.forestry.stack("oakStick")
);
GameRegistry.addRecipe(
@@ -234,7 +234,7 @@ public class ModuleItems implements IInitializable {
null,
((ItemMisc) ExtraTrees.itemMisc).getStack(ExtraTreeItems.WoodWax, 4),
"x",
'x', Mods.Forestry.stack("beeswax")
'x', Mods.forestry.stack("beeswax")
);
if (Binnie.Liquid.getLiquidStack("Creosote Oil", 100) != null) {
@@ -244,13 +244,13 @@ public class ModuleItems implements IInitializable {
null,
((ItemMisc) ExtraTrees.itemMisc).getStack(ExtraTreeItems.WoodWax, 1),
"x",
'x', Mods.Forestry.stack("beeswax")
'x', Mods.forestry.stack("beeswax")
);
}
for (FluidContainerRegistry.FluidContainerData data : FluidContainerRegistry.getRegisteredFluidContainerData()) {
if (data.fluid.isFluidEqual(Binnie.Liquid.getLiquidStack("water", 0)) && data.fluid.amount == 1000) {
CraftingManager.getInstance().addRecipe(Mods.Forestry.stack("mulch"), " b ", "bwb", " b ", 'b', ExtraTreeItems.Bark.get(1), 'w', data.filledContainer.copy());
CraftingManager.getInstance().addRecipe(Mods.forestry.stack("mulch"), " b ", "bwb", " b ", 'b', ExtraTreeItems.Bark.get(1), 'w', data.filledContainer.copy());
}
}
@@ -36,7 +36,7 @@ public class ModuleMachine implements IInitializable {
'G', Blocks.glass,
'g', ExtraTreeItems.ProvenGear.get(1),
'A', Items.iron_axe,
's', Mods.Forestry.stack("sturdyMachine"),
's', Mods.forestry.stack("sturdyMachine"),
'P', "gearBronze"
}
));
@@ -48,7 +48,7 @@ public class ModuleMachine implements IInitializable {
'i', "ingotIron",
'G', Blocks.glass,
't', "ingotTin",
'S', Mods.Forestry.stack("sturdyMachine"),
'S', Mods.forestry.stack("sturdyMachine"),
'P', "gearBronze"
}
));
@@ -60,7 +60,7 @@ public class ModuleMachine implements IInitializable {
'i', "ingotIron",
'G', Blocks.glass,
'b', "gearBronze",
'S', Mods.Forestry.stack("sturdyMachine"),
'S', Mods.forestry.stack("sturdyMachine"),
'P', "gearBronze"
}
));
@@ -72,7 +72,7 @@ public class ModuleMachine implements IInitializable {
'i', "ingotIron",
'G', Blocks.glass,
'r', "dustRedstone",
'S', Mods.Forestry.stack("sturdyMachine"),
'S', Mods.forestry.stack("sturdyMachine"),
'P', "gearBronze"
}
));
@@ -83,7 +83,7 @@ public class ModuleMachine implements IInitializable {
'G', Blocks.glass,
'g', ExtraTreeItems.ProvenGear.get(1),
'w', Blocks.planks,
's', Mods.Forestry.stack("impregnatedCasing")
's', Mods.forestry.stack("impregnatedCasing")
));
CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(
@@ -92,7 +92,7 @@ public class ModuleMachine implements IInitializable {
'G', Blocks.glass,
'g', ExtraTreeItems.ProvenGear.get(1),
'w', Blocks.wooden_slab,
's', Mods.Forestry.stack("impregnatedCasing")
's', Mods.forestry.stack("impregnatedCasing")
));
CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(
@@ -101,7 +101,7 @@ public class ModuleMachine implements IInitializable {
'G', Blocks.glass,
'g', ExtraTreeItems.ProvenGear.get(1),
'w', Blocks.glass,
's', Mods.Forestry.stack("impregnatedCasing")
's', Mods.forestry.stack("impregnatedCasing")
));
CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(
@@ -110,7 +110,7 @@ public class ModuleMachine implements IInitializable {
'G', Blocks.glass,
'g', ExtraTreeItems.ProvenGear.get(1),
'w', Items.clay_ball,
's', Mods.Forestry.stack("impregnatedCasing")
's', Mods.forestry.stack("impregnatedCasing")
));
}
}
@@ -6,7 +6,7 @@ import net.minecraft.world.World;
public class BlockTypeLeaf extends BlockType {
public BlockTypeLeaf() {
super(Mods.Forestry.block("leaves"), 0);
super(Mods.forestry.block("leaves"), 0);
}
@Override