From 2f683650c02890daa7aae7eb2e8ba6449b5f25f1 Mon Sep 17 00:00:00 2001 From: Alexander Kornilov Date: Sat, 3 Jun 2017 08:50:03 +0300 Subject: [PATCH] [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 --- .../botany/craftgui/ControlColorDisplay.java | 2 +- .../botany/craftgui/ControlColorOption.java | 2 +- .../craftgui/ControlColourMixSymbol.java | 2 +- .../craftgui/WindowBotanistDatabase.java | 26 +- .../java/binnie/botany/farm/GardenLogic.java | 2 +- .../botany/gardening/ModuleGardening.java | 22 +- src/main/java/binnie/core/Mods.java | 24 +- .../java/binnie/core/craftgui/Tooltip.java | 17 +- .../java/binnie/core/craftgui/Widget.java | 46 +- .../binnie/core/craftgui/WidgetAttribute.java | 10 +- .../binnie/core/craftgui/WindowFieldKit.java | 48 +- .../binnie/core/craftgui/WindowGenesis.java | 89 +-- .../core/craftgui/controls/ControlButton.java | 4 +- .../craftgui/controls/ControlCheckbox.java | 2 +- .../craftgui/controls/ControlTextEdit.java | 4 +- .../core/craftgui/controls/core/Control.java | 8 +- .../controls/listbox/ControlList.java | 4 - .../controls/listbox/ControlOption.java | 2 +- .../controls/scroll/ControlScrollBar.java | 2 +- .../craftgui/controls/tab/ControlTab.java | 2 +- .../ControlDatabaseIndividualDisplay.java | 55 +- .../database/ControlItemStackOption.java | 7 +- .../craftgui/database/ControlMutationBox.java | 51 +- .../database/ControlMutationItem.java | 32 +- .../database/ControlMutationSymbol.java | 2 +- .../craftgui/database/ControlSpeciesBox.java | 11 +- ...tion.java => ControlSpeciesBoxOption.java} | 20 +- .../core/craftgui/database/DatabaseTab.java | 4 +- .../craftgui/database/EnumDiscoveryState.java | 8 +- .../craftgui/database/PageBranchOverview.java | 58 +- .../craftgui/database/PageBranchSpecies.java | 30 +- .../core/craftgui/database/PageBreeder.java | 16 +- .../database/PageSpeciesMutations.java | 12 +- .../database/PageSpeciesOverview.java | 15 +- .../database/PageSpeciesResultant.java | 12 +- .../database/WindowAbstractDatabase.java | 19 +- .../craftgui/minecraft/ContainerCraftGUI.java | 121 ++-- .../core/craftgui/minecraft/CustomSlot.java | 14 +- .../core/craftgui/minecraft/Dialog.java | 29 +- .../core/craftgui/minecraft/GUIIcon.java | 3 +- .../core/craftgui/minecraft/GuiCraftGUI.java | 34 +- .../minecraft/IMachineInformation.java | 3 +- .../craftgui/minecraft/IMinecraftTooltip.java | 3 +- .../minecraft/IWindowAffectsShiftClick.java | 3 +- .../craftgui/minecraft/InventoryType.java | 3 +- .../core/craftgui/minecraft/ListMap.java | 3 +- .../craftgui/minecraft/MinecraftTooltip.java | 13 +- .../craftgui/minecraft/ModuleCraftGUI.java | 3 +- .../core/craftgui/minecraft/Window.java | 148 ++--- .../craftgui/minecraft/WindowInventory.java | 42 +- .../minecraft/control/ControlEnergyBar.java | 10 +- .../minecraft/control/ControlErrorState.java | 28 +- .../minecraft/control/ControlHelp.java | 4 +- .../minecraft/control/ControlInfo.java | 4 +- .../minecraft/control/ControlItemDisplay.java | 23 +- .../minecraft/control/ControlLiquidTank.java | 12 +- .../control/ControlPlayerInventory.java | 20 - .../minecraft/control/ControlPowerSystem.java | 4 +- .../control/ControlProgressBase.java | 85 +-- .../minecraft/control/ControlSlide.java | 4 +- .../minecraft/control/ControlSlot.java | 21 +- .../minecraft/control/ControlSlotArray.java | 23 - .../minecraft/control/ControlSlotBase.java | 2 +- .../minecraft/control/ControlSlotCharge.java | 10 +- .../minecraft/control/ControlUser.java | 4 +- .../minecraft/control/EnumHighlighting.java | 22 +- .../binnie/core/genetics/BreedingSystem.java | 3 +- .../core/genetics/EnumBeeBooleanModifier.java | 8 +- .../binnie/core/genetics/EnumBeeModifier.java | 12 +- .../binnie/core/genetics/ForestryAllele.java | 15 - src/main/java/binnie/core/genetics/Gene.java | 5 +- .../binnie/core/genetics/IAlleleProvider.java | 7 - .../core/genetics/TreeBreedingSystem.java | 8 +- .../binnie/core/liquid/FluidContainer.java | 6 +- .../power/ComponentPowerReceptor.java | 4 +- .../storage/ControlColourSelector.java | 2 +- .../machines/storage/WindowCompartment.java | 2 +- .../extrabees/apiary/EnumHiveFrame.java | 52 +- .../binnie/extrabees/apiary/ModuleApiary.java | 42 +- .../apiary/machine/AlvearyStimulator.java | 46 +- .../binnie/extrabees/core/ExtraBeeItems.java | 6 +- .../genetics/ExtraBeeDefinition.java | 2 +- .../extrabees/genetics/ExtraBeesFlowers.java | 6 +- .../extrabees/gui/database/ControlBiomes.java | 2 +- .../gui/database/ControlClimateBar.java | 4 +- .../gui/database/WindowApiaristDatabase.java | 20 +- .../extrabees/products/ItemHoneyComb.java | 14 +- .../extrabees/products/ModuleProducts.java | 2 +- .../binnie/extratrees/block/ModuleBlocks.java | 10 +- .../binnie/extratrees/block/PlankType.java | 4 +- .../extratrees/block/decor/BlockFence.java | 2 +- .../extratrees/config/ConfigurationMain.java | 2 +- .../dictionary/ControlBreweryProgress.java | 2 +- .../dictionary/ControlFruitPressProgress.java | 2 +- .../dictionary/ControlTileSelect.java | 2 +- .../craftgui/dictionary/PageSpeciesImage.java | 2 +- .../dictionary/WindowArboristDatabase.java | 38 +- .../WindowLepidopteristDatabase.java | 16 +- .../craftgui/kitchen/ControlDropDownMenu.java | 2 +- .../craftgui/kitchen/ControlFluidDisplay.java | 2 +- .../craftgui/kitchen/ControlSlotFluid.java | 2 +- .../extratrees/genetics/ButterflySpecies.java | 6 +- .../extratrees/genetics/ExtraTreeSpecies.java | 6 +- .../java/binnie/extratrees/item/Food.java | 6 +- .../binnie/extratrees/item/ModuleItems.java | 8 +- .../extratrees/machines/ModuleMachine.java | 16 +- .../extratrees/worldgen/BlockTypeLeaf.java | 2 +- .../binnie/genetics/craftgui/ControlGene.java | 2 +- .../genetics/gui/AnalystPageMutations.java | 16 +- .../gui/ControlAnalystChromosome.java | 2 +- .../genetics/gui/ControlChromoPicker.java | 2 +- .../genetics/gui/ControlToleranceBar.java | 2 +- .../binnie/genetics/gui/WindowAnalyst.java | 4 +- .../java/binnie/genetics/item/ModuleItem.java | 12 +- .../genetics/machine/ModuleMachine.java | 8 +- .../machine/acclimatiser/Acclimatiser.java | 10 +- .../assets/binniecore/lang/en_GB.lang | 282 ---------- .../assets/binniecore/lang/en_US.lang | 25 + .../assets/binniecore/lang/ru_RU.lang | 25 + .../resources/assets/botany/lang/en_GB.lang | 290 +--------- .../resources/assets/botany/lang/en_US.lang | 2 - .../assets/extrabees/lang/en_GB.lang | 524 ------------------ .../assets/extrabees/lang/en_US.lang | 13 +- .../assets/extratrees/lang/en_GB.lang | 444 --------------- .../resources/assets/genetics/lang/en_GB.lang | 105 +--- 125 files changed, 962 insertions(+), 2572 deletions(-) rename src/main/java/binnie/core/craftgui/database/{ControlSpeciexBoxOption.java => ControlSpeciesBoxOption.java} (64%) delete mode 100644 src/main/java/binnie/core/genetics/IAlleleProvider.java diff --git a/src/main/java/binnie/botany/craftgui/ControlColorDisplay.java b/src/main/java/binnie/botany/craftgui/ControlColorDisplay.java index 52eddeed..e91905e5 100644 --- a/src/main/java/binnie/botany/craftgui/ControlColorDisplay.java +++ b/src/main/java/binnie/botany/craftgui/ControlColorDisplay.java @@ -15,7 +15,7 @@ public class ControlColorDisplay extends Control implements IControlValue { super(controlList, option, option.getName(), y); setSize(new IPoint(getSize().x(), 20.0f)); (controlBee = new ControlColorDisplay(this, 2.0f, 2.0f)).setValue(option); - addAttribute(WidgetAttribute.MouseOver); + addAttribute(WidgetAttribute.MOUSE_OVER); CraftGUIUtil.moveWidget(textWidget, new IPoint(22.0f, 0.0f)); textWidget.setSize(textWidget.getSize().sub(new IPoint(24.0f, 0.0f))); int th = (int) CraftGUI.Render.textHeight(textWidget.getValue(), textWidget.getSize().x()); diff --git a/src/main/java/binnie/botany/craftgui/ControlColourMixSymbol.java b/src/main/java/binnie/botany/craftgui/ControlColourMixSymbol.java index e4c9c719..b5183686 100644 --- a/src/main/java/binnie/botany/craftgui/ControlColourMixSymbol.java +++ b/src/main/java/binnie/botany/craftgui/ControlColourMixSymbol.java @@ -25,7 +25,7 @@ public class ControlColourMixSymbol extends Control implements ITooltip { super(parent, x, y, 16 + type * 16, 16.0f); this.type = type; value = null; - addAttribute(WidgetAttribute.MouseOver); + addAttribute(WidgetAttribute.MOUSE_OVER); } @Override diff --git a/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java b/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java index 6988a2ac..45d13d2e 100644 --- a/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java +++ b/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java @@ -38,17 +38,17 @@ public class WindowBotanistDatabase extends WindowAbstractDatabase { @Override protected void addTabs() { - new PageSpeciesOverview(getInfoPages(Mode.Species), new DatabaseTab(Botany.instance, "species.overview", 0)); - new PageSpeciesFlowerGenome(getInfoPages(Mode.Species), new DatabaseTab(Botany.instance, "genome", 0)); - new PageSpeciesClassification(getInfoPages(Mode.Species), new DatabaseTab(Botany.instance, "species.classification", 0)); - new PageSpeciesResultant(getInfoPages(Mode.Species), new DatabaseTab(Botany.instance, "species.resultant", 0)); - new PageSpeciesMutations(getInfoPages(Mode.Species), new DatabaseTab(Botany.instance, "species.further", 0)); - new PageBranchOverview(getInfoPages(Mode.Branches), new DatabaseTab(Botany.instance, "branches.overview", 0)); - new PageBranchSpecies(getInfoPages(Mode.Branches), new DatabaseTab(Botany.instance, "branches.species", 0)); - createMode(FlowerMode.Colour, new ColorModeWidget()); - new PageColorMixResultant(getInfoPages(FlowerMode.Colour), new DatabaseTab(Botany.instance, "colour.resultant", 0)); - new PageColourMix(getInfoPages(FlowerMode.Colour), new DatabaseTab(Botany.instance, "colour.further", 0)); - new PageBreeder(getInfoPages(Mode.Breeder), getUsername(), new DatabaseTab(Botany.instance, "breeder", 0)); + new PageSpeciesOverview(getInfoPages(Mode.Species), new DatabaseTab(Botany.instance, "species.overview")); + new PageSpeciesFlowerGenome(getInfoPages(Mode.Species), new DatabaseTab(Botany.instance, "genome")); + new PageSpeciesClassification(getInfoPages(Mode.Species), new DatabaseTab(Botany.instance, "species.classification")); + new PageSpeciesResultant(getInfoPages(Mode.Species), new DatabaseTab(Botany.instance, "species.resultant")); + new PageSpeciesMutations(getInfoPages(Mode.Species), new DatabaseTab(Botany.instance, "species.further")); + new PageBranchOverview(getInfoPages(Mode.Branches), new DatabaseTab(Botany.instance, "branches.overview")); + new PageBranchSpecies(getInfoPages(Mode.Branches), new DatabaseTab(Botany.instance, "branches.species")); + createMode(FlowerMode.COLOR, new ColorModeWidget()); + new PageColorMixResultant(getInfoPages(FlowerMode.COLOR), new DatabaseTab(Botany.instance, "colour.resultant")); + new PageColourMix(getInfoPages(FlowerMode.COLOR), new DatabaseTab(Botany.instance, "colour.further")); + new PageBreeder(getInfoPages(Mode.Breeder), getUsername(), new DatabaseTab(Botany.instance, "breeder")); } @Override @@ -62,7 +62,7 @@ public class WindowBotanistDatabase extends WindowAbstractDatabase { } enum FlowerMode implements IDatabaseMode { - Colour; + COLOR; @Override public String getName() { @@ -72,7 +72,7 @@ public class WindowBotanistDatabase extends WindowAbstractDatabase { private class ColorModeWidget extends ModeWidgets { public ColorModeWidget() { - super(FlowerMode.Colour, WindowBotanistDatabase.this); + super(FlowerMode.COLOR, WindowBotanistDatabase.this); } @Override diff --git a/src/main/java/binnie/botany/farm/GardenLogic.java b/src/main/java/binnie/botany/farm/GardenLogic.java index 4515287c..92c6e795 100644 --- a/src/main/java/binnie/botany/farm/GardenLogic.java +++ b/src/main/java/binnie/botany/farm/GardenLogic.java @@ -340,7 +340,7 @@ public class GardenLogic extends FarmLogic { try { IOwnable housing2 = (IOwnable) housing; GameProfile prof; - if (Mods.Forestry.dev()) { + if (Mods.forestry.dev()) { prof = (GameProfile) IOwnable.class.getMethod("getOwner", new Class[0]).invoke(housing2); } else { prof = (GameProfile) IOwnable.class.getMethod("getOwnerProfile", new Class[0]).invoke(housing2); diff --git a/src/main/java/binnie/botany/gardening/ModuleGardening.java b/src/main/java/binnie/botany/gardening/ModuleGardening.java index 81047b62..4e069dd3 100644 --- a/src/main/java/binnie/botany/gardening/ModuleGardening.java +++ b/src/main/java/binnie/botany/gardening/ModuleGardening.java @@ -127,7 +127,7 @@ public class ModuleGardening implements IInitializable { for (int insulate = 0; insulate < 6; ++insulate) { ItemStack tubes = new ItemStack(Botany.insulatedTube, 2, mat + 128 * insulate); ItemStack insulateStack = ItemInsulatedTube.getInsulateStack(tubes); - ItemStack forestryTube = new ItemStack(Mods.Forestry.item("thermionicTubes"), 1, mat); + ItemStack forestryTube = new ItemStack(Mods.forestry.item("thermionicTubes"), 1, mat); GameRegistry.addShapelessRecipe(tubes, forestryTube, forestryTube, insulateStack); } } @@ -193,11 +193,11 @@ public class ModuleGardening implements IInitializable { new ItemStack(Items.wheat_seeds), new ItemStack(Items.wheat_seeds) ); - GameRegistry.addShapelessRecipe(BotanyItems.AshPowder.get(4), Mods.Forestry.stack("ash")); - GameRegistry.addShapelessRecipe(BotanyItems.MulchPowder.get(4), Mods.Forestry.stack("mulch")); - GameRegistry.addShapelessRecipe(BotanyItems.CompostPowder.get(4), Mods.Forestry.stack("fertilizerBio")); - GameRegistry.addShapelessRecipe(BotanyItems.FertiliserPowder.get(4), Mods.Forestry.stack("fertilizerCompound")); - GameRegistry.addShapelessRecipe(BotanyItems.PulpPowder.get(4), Mods.Forestry.stack("woodPulp")); + GameRegistry.addShapelessRecipe(BotanyItems.AshPowder.get(4), Mods.forestry.stack("ash")); + GameRegistry.addShapelessRecipe(BotanyItems.MulchPowder.get(4), Mods.forestry.stack("mulch")); + GameRegistry.addShapelessRecipe(BotanyItems.CompostPowder.get(4), Mods.forestry.stack("fertilizerBio")); + GameRegistry.addShapelessRecipe(BotanyItems.FertiliserPowder.get(4), Mods.forestry.stack("fertilizerCompound")); + GameRegistry.addShapelessRecipe(BotanyItems.PulpPowder.get(4), Mods.forestry.stack("woodPulp")); GameRegistry.addRecipe(new ShapelessOreRecipe( BotanyItems.SulphurPowder.get(4), new Object[]{"dustSulphur"} @@ -212,7 +212,7 @@ public class ModuleGardening implements IInitializable { )); ModuleGardening.queuedAcidFertilisers.put(BotanyItems.SulphurPowder.get(1), 1); ModuleGardening.queuedAcidFertilisers.put(BotanyItems.MulchPowder.get(1), 1); - ModuleGardening.queuedAcidFertilisers.put(new ItemStack(GameRegistry.findItem("Forestry", "mulch")), 2); + ModuleGardening.queuedAcidFertilisers.put(new ItemStack(GameRegistry.findItem("FORESTRY", "mulch")), 2); for (ItemStack stack : OreDictionary.getOres("dustSulfur")) { ModuleGardening.queuedAcidFertilisers.put(stack, 2); @@ -220,12 +220,12 @@ public class ModuleGardening implements IInitializable { ModuleGardening.queuedAlkalineFertilisers.put(BotanyItems.AshPowder.get(1), 1); ModuleGardening.queuedAlkalineFertilisers.put(BotanyItems.PulpPowder.get(1), 1); - ModuleGardening.queuedAlkalineFertilisers.put(new ItemStack(GameRegistry.findItem("Forestry", "ash")), 2); - ModuleGardening.queuedAlkalineFertilisers.put(new ItemStack(GameRegistry.findItem("Forestry", "woodPulp")), 2); + ModuleGardening.queuedAlkalineFertilisers.put(new ItemStack(GameRegistry.findItem("FORESTRY", "ash")), 2); + ModuleGardening.queuedAlkalineFertilisers.put(new ItemStack(GameRegistry.findItem("FORESTRY", "woodPulp")), 2); ModuleGardening.queuedNutrientFertilisers.put(BotanyItems.CompostPowder.get(1), 1); ModuleGardening.queuedNutrientFertilisers.put(BotanyItems.FertiliserPowder.get(1), 1); - ModuleGardening.queuedNutrientFertilisers.put(new ItemStack(GameRegistry.findItem("Forestry", "fertilizerBio")), 2); - ModuleGardening.queuedNutrientFertilisers.put(new ItemStack(GameRegistry.findItem("Forestry", "fertilizerCompound")), 2); + ModuleGardening.queuedNutrientFertilisers.put(new ItemStack(GameRegistry.findItem("FORESTRY", "fertilizerBio")), 2); + ModuleGardening.queuedNutrientFertilisers.put(new ItemStack(GameRegistry.findItem("FORESTRY", "fertilizerCompound")), 2); for (Map.Entry entry : ModuleGardening.queuedAcidFertilisers.entrySet()) { addAcidFertiliser(entry.getKey(), entry.getValue()); diff --git a/src/main/java/binnie/core/Mods.java b/src/main/java/binnie/core/Mods.java index 94dd07af..108dcc0e 100644 --- a/src/main/java/binnie/core/Mods.java +++ b/src/main/java/binnie/core/Mods.java @@ -9,14 +9,14 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; public class Mods { - public static Mod Forestry; - public static Mod IC2; - public static Mod Botania; - private static boolean WARN; + public static Mod forestry; + public static Mod ic2; + public static Mod botania; + private static boolean warn; private static Item findItem(String modId, String name) { Item stack = GameRegistry.findItem(modId, name); - if (stack == null && Mods.WARN && modId.equals("Forestry")) { + if (stack == null && Mods.warn && modId.equals("FORESTRY")) { throw new RuntimeException("Item not found: " + modId + ":" + name); } return stack; @@ -24,7 +24,7 @@ public class Mods { private static ItemStack findItemStack(String modId, String name, int stackSize) { ItemStack stack = GameRegistry.findItemStack(modId, name, stackSize); - if (stack == null && Mods.WARN && modId.equals("Forestry")) { + if (stack == null && Mods.warn && modId.equals("FORESTRY")) { throw new RuntimeException("Stack not found: " + modId + ":" + name); } return stack; @@ -32,24 +32,24 @@ public class Mods { private static Block findBlock(String modId, String name) { Block stack = GameRegistry.findBlock(modId, name); - if (stack == null && Mods.WARN && modId.equals("Forestry")) { + if (stack == null && Mods.warn && modId.equals("FORESTRY")) { throw new RuntimeException("Block not found: " + modId + ":" + name); } return stack; } static { - Mods.Forestry = new Mod("Forestry") { + Mods.forestry = new Mod("FORESTRY") { @Override public boolean dev() { - String forVersion = Loader.instance().getIndexedModList().get("Forestry").getVersion(); + String forVersion = Loader.instance().getIndexedModList().get("FORESTRY").getVersion(); Restriction rest = new Restriction(new DefaultArtifactVersion("3.6"), true, null, false); return rest.containsVersion(new DefaultArtifactVersion(forVersion)); } }; - Mods.IC2 = new Mod("IC2"); - Mods.Botania = new Mod("Botania"); - Mods.WARN = true; + Mods.ic2 = new Mod("IC2"); + Mods.botania = new Mod("BOTANIA"); + Mods.warn = true; } public static class Mod { diff --git a/src/main/java/binnie/core/craftgui/Tooltip.java b/src/main/java/binnie/core/craftgui/Tooltip.java index 145f76d3..2ec82ef3 100644 --- a/src/main/java/binnie/core/craftgui/Tooltip.java +++ b/src/main/java/binnie/core/craftgui/Tooltip.java @@ -15,7 +15,7 @@ public class Tooltip { public Tooltip() { tooltip = new ArrayList<>(); - type = Type.Standard; + type = Type.STANDARD; maxWidth = 256; } @@ -41,11 +41,6 @@ public class Tooltip { return tooltip.size() > 0; } - public String getLine(int index) { - String string = getList().get(index); - return string; - } - public void add(List list) { for (Object obj : list) { tooltip.add((String) obj); @@ -69,11 +64,11 @@ public class Tooltip { } public enum Type implements ITooltipType { - Standard, - Help, - Information, - User, - Power + STANDARD, + HELP, + INFORMATION, + USER, + POWER } public interface ITooltipType { diff --git a/src/main/java/binnie/core/craftgui/Widget.java b/src/main/java/binnie/core/craftgui/Widget.java index ab3c0f22..c13da5b6 100644 --- a/src/main/java/binnie/core/craftgui/Widget.java +++ b/src/main/java/binnie/core/craftgui/Widget.java @@ -90,7 +90,7 @@ public class Widget implements IWidget { @Override public IWidget addWidget(IWidget widget) { - if (subWidgets.size() != 0 && subWidgets.get(subWidgets.size() - 1).hasAttribute(WidgetAttribute.AlwaysOnTop)) { + if (subWidgets.size() != 0 && subWidgets.get(subWidgets.size() - 1).hasAttribute(WidgetAttribute.ALWAYS_ON_TOP)) { subWidgets.add(subWidgets.size() - 1, widget); } else { subWidgets.add(widget); @@ -214,12 +214,12 @@ public class Widget implements IWidget { @Override public boolean canMouseOver() { - return hasAttribute(WidgetAttribute.MouseOver); + return hasAttribute(WidgetAttribute.MOUSE_OVER); } @Override public boolean canFocus() { - return hasAttribute(WidgetAttribute.CanFocus); + return hasAttribute(WidgetAttribute.CAN_FOCUS); } @Override @@ -276,23 +276,25 @@ public class Widget implements IWidget { @Override public void render() { - if (isVisible()) { - CraftGUI.Render.preRender(this); - onRender(RenderStage.PreChildren); - - for (IWidget widget : getWidgets()) { - widget.render(); - } - - for (IWidget widget : getWidgets()) { - CraftGUI.Render.preRender(widget); - widget.onRender(RenderStage.PostSiblings); - CraftGUI.Render.postRender(widget); - } - - onRender(RenderStage.PostChildren); - CraftGUI.Render.postRender(this); + if (!isVisible()) { + return; } + + CraftGUI.Render.preRender(this); + onRender(RenderStage.PreChildren); + + for (IWidget widget : getWidgets()) { + widget.render(); + } + + for (IWidget widget : getWidgets()) { + CraftGUI.Render.preRender(widget); + widget.onRender(RenderStage.PostSiblings); + CraftGUI.Render.postRender(widget); + } + + onRender(RenderStage.PostChildren); + CraftGUI.Render.postRender(this); } @Override @@ -308,7 +310,7 @@ public class Widget implements IWidget { onUpdateClient(); List deletedWidgets = new ArrayList(); for (IWidget widget : getWidgets()) { - if (widget.hasAttribute(WidgetAttribute.NeedsDeletion)) { + if (widget.hasAttribute(WidgetAttribute.NEEDS_DELETION)) { deletedWidgets.add(widget); } else { widget.updateClient(); @@ -473,10 +475,6 @@ public class Widget implements IWidget { return getArea().contains(position); } - public void scheduleDeletion() { - addAttribute(WidgetAttribute.NeedsDeletion); - } - @Override public int getLevel() { int level = (getParent() == null) ? 0 : getParent().getLevel(); diff --git a/src/main/java/binnie/core/craftgui/WidgetAttribute.java b/src/main/java/binnie/core/craftgui/WidgetAttribute.java index a96700a7..ce03ada8 100644 --- a/src/main/java/binnie/core/craftgui/WidgetAttribute.java +++ b/src/main/java/binnie/core/craftgui/WidgetAttribute.java @@ -1,9 +1,9 @@ package binnie.core.craftgui; public enum WidgetAttribute { - MouseOver, - CanFocus, - NeedsDeletion, - AlwaysOnTop, - BlockTooltip + MOUSE_OVER, + CAN_FOCUS, + NEEDS_DELETION, + ALWAYS_ON_TOP, + BLOCK_TOOLTIP } diff --git a/src/main/java/binnie/core/craftgui/WindowFieldKit.java b/src/main/java/binnie/core/craftgui/WindowFieldKit.java index 6d218b2f..c91fabc3 100644 --- a/src/main/java/binnie/core/craftgui/WindowFieldKit.java +++ b/src/main/java/binnie/core/craftgui/WindowFieldKit.java @@ -56,7 +56,6 @@ public class WindowFieldKit extends Window { private float analyseProgress; private boolean isAnalysing; private Map info; - private ItemStack prev; public WindowFieldKit(EntityPlayer player, IInventory inventory, Side side) { super(280.0f, 230.0f, player, inventory, side); @@ -68,7 +67,6 @@ public class WindowFieldKit extends Window { analyseProgress = 1.0f; isAnalysing = false; info = new HashMap<>(); - prev = null; } @Override @@ -111,7 +109,7 @@ public class WindowFieldKit extends Window { @Override public void initialiseClient() { - setTitle("Field Kit"); + setTitle(getName()); CraftGUI.Render.stylesheet(new StyleSheetPunnett()); getWindowInventory().createSlot(0); getWindowInventory().createSlot(1); @@ -223,28 +221,30 @@ public class WindowFieldKit extends Window { ((EntityPlayerMP) getPlayer()).updateHeldItem(); } - if (isClient()) { - ItemStack item = getWindowInventory().getStackInSlot(0); - prev = item; - text.setValue(""); - if (item != null && !Analyser.isAnalysed(item)) { - if (getWindowInventory().getStackInSlot(1) == null) { - text.setValue("No Paper!"); - isAnalysing = false; - analyseProgress = 1.0f; - } else { - startAnalysing(); - chromo.setRoot(null); - } - } else if (item != null) { + if (!isClient()) { + return; + } + + ItemStack item = getWindowInventory().getStackInSlot(0); + text.setValue(""); + + if (item != null && !Analyser.isAnalysed(item)) { + if (getWindowInventory().getStackInSlot(1) == null) { + text.setValue("No Paper!"); isAnalysing = false; analyseProgress = 1.0f; - refreshSpecies(); } else { - isAnalysing = false; - analyseProgress = 1.0f; + startAnalysing(); chromo.setRoot(null); } + } else if (item != null) { + isAnalysing = false; + analyseProgress = 1.0f; + refreshSpecies(); + } else { + isAnalysing = false; + analyseProgress = 1.0f; + chromo.setRoot(null); } } @@ -270,10 +270,12 @@ public class WindowFieldKit extends Window { @Override public void recieveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) { super.recieveGuiNBT(side, player, name, nbt); - if (side == Side.SERVER && name.equals("analyse")) { - getWindowInventory().setInventorySlotContents(0, Analyser.analyse(getWindowInventory().getStackInSlot(0))); - getWindowInventory().decrStackSize(1, 1); + if (side != Side.SERVER || !name.equals("analyse")) { + return; } + + getWindowInventory().setInventorySlotContents(0, Analyser.analyse(getWindowInventory().getStackInSlot(0))); + getWindowInventory().decrStackSize(1, 1); } static class StyleSheetPunnett extends StyleSheet { diff --git a/src/main/java/binnie/core/craftgui/WindowGenesis.java b/src/main/java/binnie/core/craftgui/WindowGenesis.java index bca257a4..cee1e0d3 100644 --- a/src/main/java/binnie/core/craftgui/WindowGenesis.java +++ b/src/main/java/binnie/core/craftgui/WindowGenesis.java @@ -61,36 +61,9 @@ public class WindowGenesis extends Window { @Override public void initialiseClient() { new ControlPlayerInventory(this); - setTitle("Genesis"); - ControlTabBar tabSystems = new ControlTabBar(this, 8.0f, 28.0f, 23.0f, 100.0f, Position.LEFT) { - @Override - public ControlTab createTab(float x, float y, float w, float h, BreedingSystem value) { - return new ControlTabIcon(this, x, y, w, h, value) { - @Override - public ItemStack getItemStack() { - int type = value.getDefaultType(); - IIndividual ind = value.getDefaultIndividual(); - return value.getSpeciesRoot().getMemberStack(ind, type); - } - - @Override - public String getName() { - return value.getName(); - } - - @Override - public int getOutlineColour() { - return value.getColor(); - } - - @Override - public boolean hasOutline() { - return true; - } - }; - } - }; + setTitle(getName()); + ControlTabBar tabSystems = new BreedingSystemControlTabBar(); tabSystems.setValues(Binnie.Genetics.getActiveSystems()); root = Binnie.Genetics.getActiveSystems().iterator().next().getSpeciesRoot(); template = root.getDefaultTemplate(); @@ -168,7 +141,6 @@ public class WindowGenesis extends Window { genes.add(new Gene(allele, type, root)); } - Map> map = Binnie.Genetics.getChromosomeMap(root); geneList.setOptions(genes); if (selection != null) { geneList.setValue(new Gene(template[selection.ordinal()], selection, root)); @@ -188,14 +160,7 @@ public class WindowGenesis extends Window { ControlItemDisplay display = new ControlItemDisplay(panelPickup, 4 + i % 3 * 18, 4 + i / 3 * 18); display.setItemStack(stack); display.setTooltip(); - display.addEventHandler(new EventMouse.Down.Handler() { - @Override - public void onEvent(EventMouse.Down event) { - NBTTagCompound nbt = new NBTTagCompound(); - stack.writeToNBT(nbt); - Window.get(event.getOrigin()).sendClientAction("genesis", nbt); - } - }.setOrigin(EventHandler.Origin.Self, display)); + display.addEventHandler(new MouseDownHandler(stack).setOrigin(EventHandler.Origin.Self, display)); i++; } } @@ -228,4 +193,52 @@ public class WindowGenesis extends Window { } } } + + private static class MouseDownHandler extends EventMouse.Down.Handler { + private final ItemStack stack; + + public MouseDownHandler(ItemStack stack) { + this.stack = stack; + } + + @Override + public void onEvent(EventMouse.Down event) { + NBTTagCompound nbt = new NBTTagCompound(); + stack.writeToNBT(nbt); + Window.get(event.getOrigin()).sendClientAction("genesis", nbt); + } + } + + private class BreedingSystemControlTabBar extends ControlTabBar { + public BreedingSystemControlTabBar() { + super(WindowGenesis.this, 8.0f, 28.0f, 23.0f, 100.0f, Position.LEFT); + } + + @Override + public ControlTab createTab(float x, float y, float w, float h, BreedingSystem value) { + return new ControlTabIcon(this, x, y, w, h, value) { + @Override + public ItemStack getItemStack() { + int type = value.getDefaultType(); + IIndividual ind = value.getDefaultIndividual(); + return value.getSpeciesRoot().getMemberStack(ind, type); + } + + @Override + public String getName() { + return value.getName(); + } + + @Override + public int getOutlineColour() { + return value.getColor(); + } + + @Override + public boolean hasOutline() { + return true; + } + }; + } + } } diff --git a/src/main/java/binnie/core/craftgui/controls/ControlButton.java b/src/main/java/binnie/core/craftgui/controls/ControlButton.java index b0a02d68..61e26dbf 100644 --- a/src/main/java/binnie/core/craftgui/controls/ControlButton.java +++ b/src/main/java/binnie/core/craftgui/controls/ControlButton.java @@ -3,7 +3,6 @@ package binnie.core.craftgui.controls; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.WidgetAttribute; -import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.events.EventButtonClicked; import binnie.core.craftgui.events.EventHandler; @@ -17,8 +16,7 @@ public class ControlButton extends Control { public ControlButton(IWidget parent, float x, float y, float width, float height) { super(parent, x, y, width, height); - addAttribute(WidgetAttribute.MouseOver); - + addAttribute(WidgetAttribute.MOUSE_OVER); mouseHandler.setOrigin(EventHandler.Origin.Self, this); addEventHandler(mouseHandler); } diff --git a/src/main/java/binnie/core/craftgui/controls/ControlCheckbox.java b/src/main/java/binnie/core/craftgui/controls/ControlCheckbox.java index 514f1f7a..8aaf8e6e 100644 --- a/src/main/java/binnie/core/craftgui/controls/ControlCheckbox.java +++ b/src/main/java/binnie/core/craftgui/controls/ControlCheckbox.java @@ -29,7 +29,7 @@ public class ControlCheckbox extends Control implements IControlValue { new ControlText(this, new IArea(16.0f, 1.0f, w - 16.0f, 16.0f), text, TextJustification.MiddleCenter).setColor(4473924); } - addAttribute(WidgetAttribute.MouseOver); + addAttribute(WidgetAttribute.MOUSE_OVER); addEventHandler(new EventMouse.Down.Handler() { @Override public void onEvent(EventMouse.Down event) { diff --git a/src/main/java/binnie/core/craftgui/controls/ControlTextEdit.java b/src/main/java/binnie/core/craftgui/controls/ControlTextEdit.java index 563b109f..1813e78c 100644 --- a/src/main/java/binnie/core/craftgui/controls/ControlTextEdit.java +++ b/src/main/java/binnie/core/craftgui/controls/ControlTextEdit.java @@ -21,8 +21,8 @@ public class ControlTextEdit extends Control implements IControlValue { super(parent, x, y, width, height); cachedValue = ""; field = new GuiTextField(getWindow().getGui().getFontRenderer(), 0, 0, 10, 10); - addAttribute(WidgetAttribute.CanFocus); - addAttribute(WidgetAttribute.MouseOver); + addAttribute(WidgetAttribute.CAN_FOCUS); + addAttribute(WidgetAttribute.MOUSE_OVER); field.setEnableBackgroundDrawing(false); addEventHandler(new EventKey.Down.Handler() { diff --git a/src/main/java/binnie/core/craftgui/controls/core/Control.java b/src/main/java/binnie/core/craftgui/controls/core/Control.java index e254570a..62db03b7 100644 --- a/src/main/java/binnie/core/craftgui/controls/core/Control.java +++ b/src/main/java/binnie/core/craftgui/controls/core/Control.java @@ -53,16 +53,10 @@ public class Control extends Widget implements ITooltipHelp, ITooltip { } public void addTooltip(String string) { - addAttribute(WidgetAttribute.MouseOver); + addAttribute(WidgetAttribute.MOUSE_OVER); tooltipStrings.add(string); } - public void addTooltip(String[] strings) { - for (String string : strings) { - addTooltip(string); - } - } - @Override public int getLevel() { return extraLevel + super.getLevel(); diff --git a/src/main/java/binnie/core/craftgui/controls/listbox/ControlList.java b/src/main/java/binnie/core/craftgui/controls/listbox/ControlList.java index e0a092c3..aca09ecb 100644 --- a/src/main/java/binnie/core/craftgui/controls/listbox/ControlList.java +++ b/src/main/java/binnie/core/craftgui/controls/listbox/ControlList.java @@ -80,10 +80,6 @@ public class ControlList extends Control implements IControlValue { return optionWidgets.keySet(); } - public Collection getAllOptions() { - return allOptions.keySet(); - } - public int getIndexOf(T value) { int index = 0; for (T option : getOptions()) { diff --git a/src/main/java/binnie/core/craftgui/controls/listbox/ControlOption.java b/src/main/java/binnie/core/craftgui/controls/listbox/ControlOption.java index 11fd6d83..c13a1af5 100644 --- a/src/main/java/binnie/core/craftgui/controls/listbox/ControlOption.java +++ b/src/main/java/binnie/core/craftgui/controls/listbox/ControlOption.java @@ -18,7 +18,7 @@ public class ControlOption extends Control implements IControlValue { super(controlList, 0.0f, height, controlList.getSize().x(), 20.0f); value = option; if (value != null) { - addAttribute(WidgetAttribute.MouseOver); + addAttribute(WidgetAttribute.MOUSE_OVER); } addSelfEventHandler(mouseHandler); } diff --git a/src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollBar.java b/src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollBar.java index 12efe323..efcb4df5 100644 --- a/src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollBar.java +++ b/src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollBar.java @@ -18,7 +18,7 @@ public class ControlScrollBar extends Control { public ControlScrollBar(IWidget parent, float x, float y, float w, float h, IControlScrollable scrollable2) { super(parent, x, y, w, h); scrollable = scrollable2; - addAttribute(WidgetAttribute.MouseOver); + addAttribute(WidgetAttribute.MOUSE_OVER); addSelfEventHandler(new EventMouse.Drag.Handler() { @Override public void onEvent(EventMouse.Drag event) { diff --git a/src/main/java/binnie/core/craftgui/controls/tab/ControlTab.java b/src/main/java/binnie/core/craftgui/controls/tab/ControlTab.java index ad4531c0..e437fb69 100644 --- a/src/main/java/binnie/core/craftgui/controls/tab/ControlTab.java +++ b/src/main/java/binnie/core/craftgui/controls/tab/ControlTab.java @@ -25,7 +25,7 @@ public class ControlTab extends Control implements ITooltip, IControlValue super(parent, x, y, w, h); setValue(value); tabBar = parent; - addAttribute(WidgetAttribute.MouseOver); + addAttribute(WidgetAttribute.MOUSE_OVER); addSelfEventHandler(new EventMouse.Down.Handler() { @Override public void onEvent(EventMouse.Down event) { diff --git a/src/main/java/binnie/core/craftgui/database/ControlDatabaseIndividualDisplay.java b/src/main/java/binnie/core/craftgui/database/ControlDatabaseIndividualDisplay.java index b9027838..82d6c096 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlDatabaseIndividualDisplay.java +++ b/src/main/java/binnie/core/craftgui/database/ControlDatabaseIndividualDisplay.java @@ -1,6 +1,7 @@ package binnie.core.craftgui.database; import binnie.Binnie; +import binnie.core.BinnieCore; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.ITooltip; import binnie.core.craftgui.IWidget; @@ -11,6 +12,7 @@ import binnie.core.craftgui.geometry.IPoint; import binnie.core.craftgui.minecraft.Window; import binnie.core.craftgui.minecraft.control.ControlItemDisplay; import binnie.core.genetics.BreedingSystem; +import binnie.core.util.I18N; import com.mojang.authlib.GameProfile; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IIndividual; @@ -23,24 +25,25 @@ public class ControlDatabaseIndividualDisplay extends ControlItemDisplay impleme private IAlleleSpecies species; public void setSpecies(IAlleleSpecies species) { - setSpecies(species, EnumDiscoveryState.Show); + setSpecies(species, EnumDiscoveryState.SHOW); } public void setSpecies(IAlleleSpecies species, EnumDiscoveryState state) { + this.species = species; ISpeciesRoot speciesRoot = Binnie.Genetics.getSpeciesRoot(species); BreedingSystem system = Binnie.Genetics.getSystem(speciesRoot.getUID()); IIndividual ind = system.getSpeciesRoot().templateAsIndividual(system.getSpeciesRoot().getTemplate(species.getUID())); super.setItemStack(system.getSpeciesRoot().getMemberStack(ind, system.getDefaultType())); - this.species = species; GameProfile username = Window.get(this).getUsername(); - if (state == EnumDiscoveryState.Undetermined) { - state = (system.isSpeciesDiscovered(species, Window.get(this).getWorld(), username) ? EnumDiscoveryState.Discovered : EnumDiscoveryState.Undiscovered); - } - if (Window.get(this) instanceof WindowAbstractDatabase && ((WindowAbstractDatabase) Window.get(this)).isNEI) { - state = EnumDiscoveryState.Show; + + if (state == EnumDiscoveryState.UNDETERMINED) { + state = (system.isSpeciesDiscovered(species, Window.get(this).getWorld(), username) ? EnumDiscoveryState.DISCOVERED : EnumDiscoveryState.UNDISCOVERED); + } else if (Window.get(this) instanceof WindowAbstractDatabase && ((WindowAbstractDatabase) Window.get(this)).isNEI) { + state = EnumDiscoveryState.SHOW; } + discovered = state; - addAttribute(WidgetAttribute.MouseOver); + addAttribute(WidgetAttribute.MOUSE_OVER); } public ControlDatabaseIndividualDisplay(IWidget parent, float x, float y) { @@ -50,15 +53,8 @@ public class ControlDatabaseIndividualDisplay extends ControlItemDisplay impleme public ControlDatabaseIndividualDisplay(IWidget parent, float x, float y, float size) { super(parent, x, y, size); species = null; - discovered = EnumDiscoveryState.Show; - addSelfEventHandler(new EventMouse.Down.Handler() { - @Override - public void onEvent(EventMouse.Down event) { - if (event.getButton() == 0 && species != null && EnumDiscoveryState.Show == discovered) { - ((WindowAbstractDatabase) getSuperParent()).gotoSpeciesDelayed(species); - } - } - }); + discovered = EnumDiscoveryState.SHOW; + addSelfEventHandler(new MouseDownHandler()); } @Override @@ -70,15 +66,15 @@ public class ControlDatabaseIndividualDisplay extends ControlItemDisplay impleme BreedingSystem system = Binnie.Genetics.getSystem(species.getRoot()); switch (discovered) { - case Show: + case SHOW: super.onRenderForeground(); return; - case Discovered: + case DISCOVERED: icon = system.getDiscoveredIcon(); break; - case Undiscovered: + case UNDISCOVERED: icon = system.getUndiscoveredIcon(); break; } @@ -94,17 +90,26 @@ public class ControlDatabaseIndividualDisplay extends ControlItemDisplay impleme } switch (discovered) { - case Show: + case SHOW: tooltip.add(species.getName()); break; - case Discovered: - tooltip.add("Discovered Species"); + case DISCOVERED: + tooltip.add(I18N.localise(BinnieCore.instance, "gui.database.discovered.discovered")); break; - case Undiscovered: - tooltip.add("Undiscovered Species"); + case UNDISCOVERED: + tooltip.add(I18N.localise(BinnieCore.instance, "gui.database.discovered.undiscovered")); break; } } + + private class MouseDownHandler extends EventMouse.Down.Handler { + @Override + public void onEvent(EventMouse.Down event) { + if (event.getButton() == 0 && species != null && EnumDiscoveryState.SHOW == discovered) { + ((WindowAbstractDatabase) getSuperParent()).gotoSpeciesDelayed(species); + } + } + } } diff --git a/src/main/java/binnie/core/craftgui/database/ControlItemStackOption.java b/src/main/java/binnie/core/craftgui/database/ControlItemStackOption.java index 5c47aef9..e39af897 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlItemStackOption.java +++ b/src/main/java/binnie/core/craftgui/database/ControlItemStackOption.java @@ -15,8 +15,11 @@ public class ControlItemStackOption extends ControlTextOption { public ControlItemStackOption(ControlList controlList, ItemStack option, int y) { super(controlList, option, option.getDisplayName(), y); setSize(new IPoint(getSize().x(), 20.0f)); - (controlBee = new ControlItemDisplay(this, 2.0f, 2.0f)).setItemStack(option); - addAttribute(WidgetAttribute.MouseOver); + + controlBee = new ControlItemDisplay(this, 2.0f, 2.0f); + controlBee.setItemStack(option); + + addAttribute(WidgetAttribute.MOUSE_OVER); CraftGUIUtil.moveWidget(textWidget, new IPoint(22.0f, 0.0f)); textWidget.setSize(textWidget.getSize().sub(new IPoint(24.0f, 0.0f))); int th = (int) CraftGUI.Render.textHeight(textWidget.getValue(), textWidget.getSize().x()); diff --git a/src/main/java/binnie/core/craftgui/database/ControlMutationBox.java b/src/main/java/binnie/core/craftgui/database/ControlMutationBox.java index 492fbb74..d332738e 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlMutationBox.java +++ b/src/main/java/binnie/core/craftgui/database/ControlMutationBox.java @@ -10,7 +10,6 @@ import forestry.api.genetics.IMutation; import java.util.List; class ControlMutationBox extends ControlListBox { - private int index; private Type type; private IAlleleSpecies species; @@ -26,37 +25,39 @@ class ControlMutationBox extends ControlListBox { } public void setSpecies(IAlleleSpecies species) { - if (species != this.species) { - this.species = species; - index = 0; - movePercentage(-100.0f); - BreedingSystem system = ((WindowAbstractDatabase) getSuperParent()).getBreedingSystem(); - List discovered = system.getDiscoveredMutations(Window.get(this).getWorld(), Window.get(this).getUsername()); + if (species == this.species) { + return; + } - if (species == null) { - return; - } + this.species = species; + movePercentage(-100.0f); + BreedingSystem system = ((WindowAbstractDatabase) getSuperParent()).getBreedingSystem(); + List discovered = system.getDiscoveredMutations(Window.get(this).getWorld(), Window.get(this).getUsername()); - if (type == Type.Resultant) { - setOptions(system.getResultantMutations(species)); + if (species == null) { + return; + } + + if (type == Type.RESULTANT) { + setOptions(system.getResultantMutations(species)); + return; + } + + List mutations = system.getFurtherMutations(species); + int i = 0; + while (i < mutations.size()) { + IMutation mutation = mutations.get(i); + if (!discovered.contains(mutations) && !((IAlleleSpecies) mutation.getTemplate()[0]).isCounted()) { + mutations.remove(i); } else { - List mutations = system.getFurtherMutations(species); - int i = 0; - while (i < mutations.size()) { - IMutation mutation = mutations.get(i); - if (!discovered.contains(mutations) && !((IAlleleSpecies) mutation.getTemplate()[0]).isCounted()) { - mutations.remove(i); - } else { - ++i; - } - } - setOptions(mutations); + i++; } } + setOptions(mutations); } enum Type { - Resultant, - Further + RESULTANT, + FURTHER } } diff --git a/src/main/java/binnie/core/craftgui/database/ControlMutationItem.java b/src/main/java/binnie/core/craftgui/database/ControlMutationItem.java index 5328a297..1eaf72e3 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlMutationItem.java +++ b/src/main/java/binnie/core/craftgui/database/ControlMutationItem.java @@ -24,21 +24,23 @@ class ControlMutationItem extends ControlOption { boolean isNEI = ((WindowAbstractDatabase) getSuperParent()).isNEI(); BreedingSystem system = ((WindowAbstractDatabase) getSuperParent()).getBreedingSystem(); - if (getValue() != null) { - boolean isMutationDiscovered = system.isMutationDiscovered(getValue(), Window.get(this).getWorld(), Window.get(this).getUsername()); - IAlleleSpecies allele; - EnumDiscoveryState state; - allele = getValue().getAllele0(); - state = ((isNEI || isMutationDiscovered) ? EnumDiscoveryState.Show : ((species == allele) ? EnumDiscoveryState.Show : EnumDiscoveryState.Undetermined)); - itemWidget1.setSpecies(allele, state); - allele = getValue().getAllele1(); - state = ((isNEI || isMutationDiscovered) ? EnumDiscoveryState.Show : ((species == allele) ? EnumDiscoveryState.Show : EnumDiscoveryState.Undetermined)); - itemWidget2.setSpecies(allele, state); - allele = (IAlleleSpecies) getValue().getTemplate()[0]; - state = ((isNEI || isMutationDiscovered) ? EnumDiscoveryState.Show : ((species == allele) ? EnumDiscoveryState.Show : EnumDiscoveryState.Undetermined)); - itemWidget3.setSpecies(allele, state); - addSymbol.setValue(getValue()); - arrowSymbol.setValue(getValue()); + if (getValue() == null) { + return; } + + boolean isMutationDiscovered = system.isMutationDiscovered(getValue(), Window.get(this).getWorld(), Window.get(this).getUsername()); + IAlleleSpecies allele; + EnumDiscoveryState state; + allele = getValue().getAllele0(); + state = ((isNEI || isMutationDiscovered) ? EnumDiscoveryState.SHOW : ((species == allele) ? EnumDiscoveryState.SHOW : EnumDiscoveryState.UNDETERMINED)); + itemWidget1.setSpecies(allele, state); + allele = getValue().getAllele1(); + state = ((isNEI || isMutationDiscovered) ? EnumDiscoveryState.SHOW : ((species == allele) ? EnumDiscoveryState.SHOW : EnumDiscoveryState.UNDETERMINED)); + itemWidget2.setSpecies(allele, state); + allele = (IAlleleSpecies) getValue().getTemplate()[0]; + state = ((isNEI || isMutationDiscovered) ? EnumDiscoveryState.SHOW : ((species == allele) ? EnumDiscoveryState.SHOW : EnumDiscoveryState.UNDETERMINED)); + itemWidget3.setSpecies(allele, state); + addSymbol.setValue(getValue()); + arrowSymbol.setValue(getValue()); } } diff --git a/src/main/java/binnie/core/craftgui/database/ControlMutationSymbol.java b/src/main/java/binnie/core/craftgui/database/ControlMutationSymbol.java index 8e30f97a..c2f6b8d9 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlMutationSymbol.java +++ b/src/main/java/binnie/core/craftgui/database/ControlMutationSymbol.java @@ -36,7 +36,7 @@ class ControlMutationSymbol extends Control implements ITooltip { super(parent, x, y, 16 + type * 16, 16.0f); value = null; this.type = type; - addAttribute(WidgetAttribute.MouseOver); + addAttribute(WidgetAttribute.MOUSE_OVER); } public void setValue(IMutation value) { diff --git a/src/main/java/binnie/core/craftgui/database/ControlSpeciesBox.java b/src/main/java/binnie/core/craftgui/database/ControlSpeciesBox.java index 1e234a5c..83c0ed4d 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlSpeciesBox.java +++ b/src/main/java/binnie/core/craftgui/database/ControlSpeciesBox.java @@ -6,19 +6,17 @@ import binnie.core.craftgui.minecraft.Window; import com.mojang.authlib.GameProfile; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IClassification; -import net.minecraft.entity.player.EntityPlayer; import java.util.ArrayList; import java.util.Collection; import java.util.List; -public class ControlSpeciesBox extends ControlListBox -{ +public class ControlSpeciesBox extends ControlListBox { private IClassification branch; @Override public IWidget createOption(IAlleleSpecies value, int y) { - return new ControlSpeciexBoxOption(getContent(), value, y); + return new ControlSpeciesBoxOption(getContent(), value, y); } public ControlSpeciesBox(IWidget parent, float x, float y, float width, float height) { @@ -36,10 +34,11 @@ public class ControlSpeciesBox extends ControlListBox movePercentage(-100.0f); setOptions(speciesList2); - EntityPlayer player = Window.get(this).getPlayer(); GameProfile playerName = Window.get(this).getUsername(); WindowAbstractDatabase db = Window.get(this); - Collection speciesList3 = db.isNEI ? db.getBreedingSystem().getAllSpecies() : db.getBreedingSystem().getDiscoveredSpecies(db.getWorld(), playerName); + Collection speciesList3 = db.isNEI + ? db.getBreedingSystem().getAllSpecies() + : db.getBreedingSystem().getDiscoveredSpecies(db.getWorld(), playerName); if (branch != null) { for (IAlleleSpecies species : branch.getMemberSpecies()) { if (speciesList3.contains(species)) { diff --git a/src/main/java/binnie/core/craftgui/database/ControlSpeciexBoxOption.java b/src/main/java/binnie/core/craftgui/database/ControlSpeciesBoxOption.java similarity index 64% rename from src/main/java/binnie/core/craftgui/database/ControlSpeciexBoxOption.java rename to src/main/java/binnie/core/craftgui/database/ControlSpeciesBoxOption.java index 5d5cf15d..3efe9b8a 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlSpeciexBoxOption.java +++ b/src/main/java/binnie/core/craftgui/database/ControlSpeciesBoxOption.java @@ -1,27 +1,31 @@ package binnie.core.craftgui.database; +import binnie.core.BinnieCore; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.WidgetAttribute; import binnie.core.craftgui.controls.listbox.ControlList; import binnie.core.craftgui.controls.listbox.ControlTextOption; import binnie.core.craftgui.geometry.CraftGUIUtil; import binnie.core.craftgui.geometry.IPoint; +import binnie.core.util.I18N; import forestry.api.genetics.IAlleleSpecies; -class ControlSpeciexBoxOption extends ControlTextOption { +class ControlSpeciesBoxOption extends ControlTextOption { private ControlDatabaseIndividualDisplay controlBee; - public ControlSpeciexBoxOption(ControlList controlList, IAlleleSpecies option, int y) { + public ControlSpeciesBoxOption(ControlList controlList, IAlleleSpecies option, int y) { super(controlList, option, option.getName(), y); setSize(new IPoint(getSize().x(), 20.0f)); - (controlBee = new ControlDatabaseIndividualDisplay(this, 2.0f, 2.0f)).setSpecies(getValue(), EnumDiscoveryState.Undetermined); - if (controlBee.discovered == EnumDiscoveryState.Discovered) { - controlBee.discovered = EnumDiscoveryState.Show; + (controlBee = new ControlDatabaseIndividualDisplay(this, 2.0f, 2.0f)).setSpecies(getValue(), EnumDiscoveryState.UNDETERMINED); + if (controlBee.discovered == EnumDiscoveryState.DISCOVERED) { + controlBee.discovered = EnumDiscoveryState.SHOW; } - textWidget.setValue((controlBee.discovered == EnumDiscoveryState.Show) ? option.getName() : "Undiscovered"); - if (controlBee.discovered == EnumDiscoveryState.Show) { - addAttribute(WidgetAttribute.MouseOver); + if (controlBee.discovered == EnumDiscoveryState.SHOW) { + textWidget.setValue(option.getName()); + addAttribute(WidgetAttribute.MOUSE_OVER); + } else { + textWidget.setValue(I18N.localise(BinnieCore.instance, "gui.database.discovered.undiscovered")); } CraftGUIUtil.moveWidget(textWidget, new IPoint(22.0f, 0.0f)); diff --git a/src/main/java/binnie/core/craftgui/database/DatabaseTab.java b/src/main/java/binnie/core/craftgui/database/DatabaseTab.java index 4b7db8b1..299048c7 100644 --- a/src/main/java/binnie/core/craftgui/database/DatabaseTab.java +++ b/src/main/java/binnie/core/craftgui/database/DatabaseTab.java @@ -8,12 +8,10 @@ import binnie.core.util.I18N; public class DatabaseTab implements ITooltipHelp { private AbstractMod mod; private String unloc; - private int colour; - public DatabaseTab(AbstractMod mod, String unloc, int colour) { + public DatabaseTab(AbstractMod mod, String unloc) { this.mod = mod; this.unloc = unloc; - this.colour = colour; } @Override diff --git a/src/main/java/binnie/core/craftgui/database/EnumDiscoveryState.java b/src/main/java/binnie/core/craftgui/database/EnumDiscoveryState.java index 68d038d4..82dd9533 100644 --- a/src/main/java/binnie/core/craftgui/database/EnumDiscoveryState.java +++ b/src/main/java/binnie/core/craftgui/database/EnumDiscoveryState.java @@ -1,8 +1,8 @@ package binnie.core.craftgui.database; public enum EnumDiscoveryState { - Show, - Undetermined, - Discovered, - Undiscovered + SHOW, + UNDETERMINED, + DISCOVERED, + UNDISCOVERED } diff --git a/src/main/java/binnie/core/craftgui/database/PageBranchOverview.java b/src/main/java/binnie/core/craftgui/database/PageBranchOverview.java index 2a8f8d9c..2f14e9e3 100644 --- a/src/main/java/binnie/core/craftgui/database/PageBranchOverview.java +++ b/src/main/java/binnie/core/craftgui/database/PageBranchOverview.java @@ -1,9 +1,11 @@ package binnie.core.craftgui.database; +import binnie.core.BinnieCore; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.controls.ControlTextCentered; +import binnie.core.util.I18N; import forestry.api.genetics.IClassification; import net.minecraft.util.EnumChatFormatting; @@ -11,48 +13,60 @@ import java.util.ArrayList; import java.util.List; public class PageBranchOverview extends PageBranch { - private ControlText pageBranchOverview_branchName; - private ControlText pageBranchOverview_branchScientific; - private ControlText pageBranchOverview_branchAuthority; - private List pageBranchOverview_branchDescription; + private ControlText branchName; + private ControlText branchScientific; + private ControlText branchAuthority; + private List branchDescription; public PageBranchOverview(IWidget parent, DatabaseTab tab) { super(parent, tab); - pageBranchOverview_branchDescription = new ArrayList<>(); - pageBranchOverview_branchName = new ControlTextCentered(this, 8.0f, ""); - pageBranchOverview_branchScientific = new ControlTextCentered(this, 32.0f, ""); - pageBranchOverview_branchAuthority = new ControlTextCentered(this, 44.0f, ""); + branchDescription = new ArrayList<>(); + branchName = new ControlTextCentered(this, 8.0f, ""); + branchScientific = new ControlTextCentered(this, 32.0f, ""); + branchAuthority = new ControlTextCentered(this, 44.0f, ""); } @Override public void onValueChanged(IClassification branch) { - pageBranchOverview_branchName.setValue(EnumChatFormatting.UNDERLINE + branch.getName() + " Branch" + EnumChatFormatting.RESET); - pageBranchOverview_branchScientific.setValue(EnumChatFormatting.ITALIC + "Apidae " + branch.getScientific() + EnumChatFormatting.RESET); - pageBranchOverview_branchAuthority.setValue("Discovered by " + EnumChatFormatting.BOLD + branch.getMemberSpecies()[0].getAuthority() + EnumChatFormatting.RESET); - for (IWidget widget : pageBranchOverview_branchDescription) { + branchName.setValue( + EnumChatFormatting.BOLD + + I18N.localise(BinnieCore.instance, "gui.database.branch.name", branch.getName()) + + EnumChatFormatting.RESET + ); + branchScientific.setValue( + EnumChatFormatting.ITALIC + + I18N.localise(BinnieCore.instance, "gui.database.branch.apidae", branch.getScientific()) + + EnumChatFormatting.RESET + ); + branchAuthority.setValue( + EnumChatFormatting.BOLD + + I18N.localise(BinnieCore.instance, "gui.database.branch.discoveredBy", branch.getMemberSpecies()[0].getAuthority()) + + EnumChatFormatting.RESET); + + for (IWidget widget : branchDescription) { deleteChild(widget); } - pageBranchOverview_branchDescription.clear(); + branchDescription.clear(); String desc = branch.getDescription(); - if (desc == null || desc == "") { - desc = "No Description Provided."; + if (desc == null || desc.isEmpty()) { + desc = I18N.localise(BinnieCore.instance, "gui.database.branch.noDesc"); } - String line = ""; - List descLines = new ArrayList(); + StringBuilder line = new StringBuilder(); + List descLines = new ArrayList<>(); for (String str : desc.split(" ")) { if (CraftGUI.Render.textWidth(line + " " + str) > 134) { - descLines.add(EnumChatFormatting.ITALIC + line + EnumChatFormatting.RESET); - line = ""; + descLines.add(EnumChatFormatting.ITALIC + line.toString() + EnumChatFormatting.RESET); + line = new StringBuilder(); } - line = line + " " + str; + line.append(" ").append(str); } - descLines.add(line); + descLines.add(line.toString()); int i = 0; for (String dLine : descLines) { - pageBranchOverview_branchDescription.add(new ControlTextCentered(this, 84 + 12 * i++, dLine)); + branchDescription.add(new ControlTextCentered(this, 84 + 12 * i++, dLine)); } } } diff --git a/src/main/java/binnie/core/craftgui/database/PageBranchSpecies.java b/src/main/java/binnie/core/craftgui/database/PageBranchSpecies.java index 7a849a9e..d2be65d5 100644 --- a/src/main/java/binnie/core/craftgui/database/PageBranchSpecies.java +++ b/src/main/java/binnie/core/craftgui/database/PageBranchSpecies.java @@ -1,16 +1,18 @@ package binnie.core.craftgui.database; +import binnie.core.BinnieCore; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.craftgui.events.EventValueChanged; +import binnie.core.util.I18N; import cpw.mods.fml.common.Mod; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IClassification; public class PageBranchSpecies extends PageBranch { - private ControlText pageBranchSpecies_title; - private ControlSpeciesBox pageBranchSpecies_speciesList; + private ControlText title; + private ControlSpeciesBox speciesList; @Mod.EventHandler public void onHandleEvent(EventValueChanged event) { @@ -19,20 +21,22 @@ public class PageBranchSpecies extends PageBranch { public PageBranchSpecies(IWidget parent, DatabaseTab tab) { super(parent, tab); - pageBranchSpecies_title = new ControlTextCentered(this, 8.0f, "Species"); - addEventHandler(new EventValueChanged.Handler() { - @Override - public void onEvent(EventValueChanged event) { - if (event.isOrigin(pageBranchSpecies_speciesList)) { - ((WindowAbstractDatabase) getSuperParent()).gotoSpecies((IAlleleSpecies) event.getValue()); - } - } - }); - pageBranchSpecies_speciesList = new ControlSpeciesBox(this, 4.0f, 20.0f, 136.0f, 152.0f); + title = new ControlTextCentered(this, 8.0f, I18N.localise(BinnieCore.instance, "gui.database.species")); + addEventHandler(new ValueHandler()); + speciesList = new ControlSpeciesBox(this, 4.0f, 20.0f, 136.0f, 152.0f); } @Override public void onValueChanged(IClassification branch) { - pageBranchSpecies_speciesList.setBranch(branch); + speciesList.setBranch(branch); + } + + private class ValueHandler extends EventValueChanged.Handler { + @Override + public void onEvent(EventValueChanged event) { + if (event.isOrigin(speciesList)) { + ((WindowAbstractDatabase) getSuperParent()).gotoSpecies((IAlleleSpecies) event.getValue()); + } + } } } diff --git a/src/main/java/binnie/core/craftgui/database/PageBreeder.java b/src/main/java/binnie/core/craftgui/database/PageBreeder.java index 1c996085..5b293b97 100644 --- a/src/main/java/binnie/core/craftgui/database/PageBreeder.java +++ b/src/main/java/binnie/core/craftgui/database/PageBreeder.java @@ -1,10 +1,12 @@ package binnie.core.craftgui.database; +import binnie.core.BinnieCore; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.craftgui.controls.page.ControlPage; import binnie.core.craftgui.minecraft.Window; import binnie.core.genetics.BreedingSystem; +import binnie.core.util.I18N; import com.mojang.authlib.GameProfile; import net.minecraft.util.EnumChatFormatting; @@ -23,16 +25,20 @@ public class PageBreeder extends ControlPage { } BreedingSystem system = ((WindowAbstractDatabase) Window.get(this)).getBreedingSystem(); - String descriptor = system.getDescriptor(); - new ControlTextCentered(this, 8.0f, EnumChatFormatting.UNDERLINE + system.getDescriptor() + " Profile" + EnumChatFormatting.RESET); - new ControlTextCentered(this, 75.0f, "" + system.discoveredSpeciesCount + "/" + system.totalSpeciesCount + " Species"); + new ControlTextCentered(this, 8.0f, + EnumChatFormatting.BOLD + + I18N.localise(BinnieCore.instance, "gui.database.descriptor", system.getDescriptor()) + + EnumChatFormatting.RESET + ); + new ControlTextCentered(this, 75.0f, I18N.localise(BinnieCore.instance, "gui.database.species.count", system.discoveredSpeciesCount, system.totalSpeciesCount)); new ControlBreedingProgress(this, 20, 87, 102, 14, system, system.discoveredSpeciesPercentage); - new ControlTextCentered(this, 115.0f, "" + system.discoveredBranchCount + "/" + system.totalBranchCount + " Branches"); + new ControlTextCentered(this, 75.0f, I18N.localise(BinnieCore.instance, "gui.database.branches.count", system.discoveredBranchCount, system.totalBranchCount)); new ControlBreedingProgress(this, 20, 127, 102, 14, system, system.discoveredBranchPercentage); if (system.discoveredSecretCount > 0) { - new ControlTextCentered(this, 155.0f, "" + system.discoveredSecretCount + "/" + system.totalSecretCount + " Secret Species"); + new ControlTextCentered(this, 75.0f, I18N.localise(BinnieCore.instance, "gui.database.species.secretCount", system.discoveredSecretCount, system.totalSecretCount)); } + new ControlTextCentered(this, 32.0f, player.getName()); new ControlTextCentered(this, 44.0f, EnumChatFormatting.ITALIC + system.getEpitome() + EnumChatFormatting.RESET); } diff --git a/src/main/java/binnie/core/craftgui/database/PageSpeciesMutations.java b/src/main/java/binnie/core/craftgui/database/PageSpeciesMutations.java index af2214a2..cde0ad1a 100644 --- a/src/main/java/binnie/core/craftgui/database/PageSpeciesMutations.java +++ b/src/main/java/binnie/core/craftgui/database/PageSpeciesMutations.java @@ -1,22 +1,24 @@ package binnie.core.craftgui.database; +import binnie.core.BinnieCore; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.controls.ControlTextCentered; +import binnie.core.util.I18N; import forestry.api.genetics.IAlleleSpecies; public class PageSpeciesMutations extends PageSpecies { - private ControlText pageSpeciesFurtherTitle; - private ControlMutationBox pageSpeciesFurtherList; + private ControlText furtherTitle; + private ControlMutationBox furtherList; public PageSpeciesMutations(IWidget parent, DatabaseTab tab) { super(parent, tab); - pageSpeciesFurtherTitle = new ControlTextCentered(this, 8.0f, "Further Mutations"); - pageSpeciesFurtherList = new ControlMutationBox(this, 4, 20, 136, 152, ControlMutationBox.Type.Further); + furtherTitle = new ControlTextCentered(this, 8.0f, I18N.localise(BinnieCore.instance, "gui.database.furtherMutations")); + furtherList = new ControlMutationBox(this, 4, 20, 136, 152, ControlMutationBox.Type.FURTHER); } @Override public void onValueChanged(IAlleleSpecies species) { - pageSpeciesFurtherList.setSpecies(species); + furtherList.setSpecies(species); } } diff --git a/src/main/java/binnie/core/craftgui/database/PageSpeciesOverview.java b/src/main/java/binnie/core/craftgui/database/PageSpeciesOverview.java index 3cf68351..8e051e01 100644 --- a/src/main/java/binnie/core/craftgui/database/PageSpeciesOverview.java +++ b/src/main/java/binnie/core/craftgui/database/PageSpeciesOverview.java @@ -1,5 +1,6 @@ package binnie.core.craftgui.database; +import binnie.core.BinnieCore; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlText; @@ -7,6 +8,7 @@ import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.craftgui.geometry.IArea; import binnie.core.craftgui.geometry.IPoint; import binnie.core.craftgui.geometry.TextJustification; +import binnie.core.util.I18N; import forestry.api.genetics.IAlleleSpecies; import net.minecraft.util.EnumChatFormatting; @@ -34,20 +36,19 @@ public class PageSpeciesOverview extends PageSpecies { @Override public void onValueChanged(IAlleleSpecies species) { - controlInd1.setSpecies(species, EnumDiscoveryState.Show); - controlInd2.setSpecies(species, EnumDiscoveryState.Show); + controlInd1.setSpecies(species, EnumDiscoveryState.SHOW); + controlInd2.setSpecies(species, EnumDiscoveryState.SHOW); String branchBinomial = (species.getBranch() != null) ? species.getBranch().getScientific() : ""; - String branchName = (species.getBranch() != null) ? species.getBranch().getName() : "Unknown"; - controlName.setValue(EnumChatFormatting.UNDERLINE + species.getName() + EnumChatFormatting.RESET); + controlName.setValue(EnumChatFormatting.BOLD + species.getName() + EnumChatFormatting.RESET); controlScientific.setValue(EnumChatFormatting.ITALIC + branchBinomial + " " + species.getBinomial() + EnumChatFormatting.RESET); - controlAuthority.setValue("Discovered by " + EnumChatFormatting.BOLD + species.getAuthority() + EnumChatFormatting.RESET); + controlAuthority.setValue(EnumChatFormatting.BOLD + "Discovered by " + species.getAuthority() + EnumChatFormatting.RESET); controlComplexity.setValue("Complexity: " + species.getComplexity()); String desc = species.getDescription(); String descBody = EnumChatFormatting.ITALIC.toString(); String descSig = ""; - if (desc == null || desc == "") { - descBody += "No Description Provided."; + if (desc == null || desc.isEmpty()) { + descBody += I18N.localise(BinnieCore.instance, "gui.database.species.noDesc"); } else { String[] descStrings = desc.split("\\|"); descBody += descStrings[0]; diff --git a/src/main/java/binnie/core/craftgui/database/PageSpeciesResultant.java b/src/main/java/binnie/core/craftgui/database/PageSpeciesResultant.java index 20753a9a..a332e898 100644 --- a/src/main/java/binnie/core/craftgui/database/PageSpeciesResultant.java +++ b/src/main/java/binnie/core/craftgui/database/PageSpeciesResultant.java @@ -1,22 +1,24 @@ package binnie.core.craftgui.database; +import binnie.core.BinnieCore; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.controls.ControlTextCentered; +import binnie.core.util.I18N; import forestry.api.genetics.IAlleleSpecies; public class PageSpeciesResultant extends PageSpecies { - private ControlText pageSpeciesResultantTitle; - private ControlMutationBox pageSpeciesResultantList; + private ControlText title; + private ControlMutationBox list; public PageSpeciesResultant(IWidget parent, DatabaseTab tab) { super(parent, tab); - pageSpeciesResultantTitle = new ControlTextCentered(this, 8.0f, "Resultant Mutations"); - pageSpeciesResultantList = new ControlMutationBox(this, 4, 20, 136, 152, ControlMutationBox.Type.Resultant); + title = new ControlTextCentered(this, 8.0f, I18N.localise(BinnieCore.instance, "gui.database.resultantMutations")); + list = new ControlMutationBox(this, 4, 20, 136, 152, ControlMutationBox.Type.RESULTANT); } @Override public void onValueChanged(IAlleleSpecies species) { - pageSpeciesResultantList.setSpecies(species); + list.setSpecies(species); } } diff --git a/src/main/java/binnie/core/craftgui/database/WindowAbstractDatabase.java b/src/main/java/binnie/core/craftgui/database/WindowAbstractDatabase.java index afe63276..f1c3596b 100644 --- a/src/main/java/binnie/core/craftgui/database/WindowAbstractDatabase.java +++ b/src/main/java/binnie/core/craftgui/database/WindowAbstractDatabase.java @@ -37,11 +37,6 @@ public abstract class WindowAbstractDatabase extends Window { protected boolean isNEI; private float selectionBoxWidth; - private float infoBoxWidth = 144.0f; - private float infoBoxHeight = 176.0f; - private float infoTabWidth = 16.0f; - private float modeTabWidth = 22.0f; - private float searchBoxHeight = 16.0f; private Map modes; private BreedingSystem system; private Panel panelInformation; @@ -149,10 +144,13 @@ public abstract class WindowAbstractDatabase extends Window { createMode(Mode.Branches, new ModeWidgets(Mode.Branches, this) { @Override public void createListBox(IArea area) { - EntityPlayer player = database.getPlayer(); GameProfile playerName = getUsername(); - Collection speciesList = database.isNEI ? database.system.getAllBranches() : database.system.getDiscoveredBranches(database.getWorld(), playerName); - (listBox = new ControlBranchBox(modePage, area.x(), area.y(), area.w(), area.h())).setOptions(speciesList); + Collection speciesList = database.isNEI + ? database.system.getAllBranches() + : database.system.getDiscoveredBranches(database.getWorld(), playerName); + + listBox = new ControlBranchBox(modePage, area.x(), area.y(), area.w(), area.h()); + listBox.setOptions(speciesList); } }); @@ -195,7 +193,7 @@ public abstract class WindowAbstractDatabase extends Window { } protected void addTabs() { - // ignoreds + // ignored } public void gotoSpecies(IAlleleSpecies value) { @@ -237,8 +235,9 @@ public abstract class WindowAbstractDatabase extends Window { public abstract static class ModeWidgets { public WindowAbstractDatabase database; public ControlPage modePage; - private ControlPages infoPages; public ControlListBox listBox; + + private ControlPages infoPages; private ControlTabBar infoTabs; public ModeWidgets(IDatabaseMode mode, WindowAbstractDatabase database) { diff --git a/src/main/java/binnie/core/craftgui/minecraft/ContainerCraftGUI.java b/src/main/java/binnie/core/craftgui/minecraft/ContainerCraftGUI.java index 243f8c0f..6e35e301 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/ContainerCraftGUI.java +++ b/src/main/java/binnie/core/craftgui/minecraft/ContainerCraftGUI.java @@ -31,8 +31,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -public class ContainerCraftGUI extends Container -{ +public class ContainerCraftGUI extends Container { private Window window; private Map syncedNBT; private Map sentNBT; @@ -44,9 +43,9 @@ public class ContainerCraftGUI extends Container private int mousedOverSlotNumber; public ContainerCraftGUI(Window window) { - syncedNBT = new HashMap(); - sentNBT = new HashMap(); - syncedTanks = new HashMap(); + syncedNBT = new HashMap<>(); + sentNBT = new HashMap<>(); + syncedTanks = new HashMap<>(); syncedPower = new PowerInfo(); syncedProcess = new ProcessInfo(); errorType = 0; @@ -106,14 +105,18 @@ public class ContainerCraftGUI extends Container super.onContainerClosed(par1EntityPlayer); WindowInventory inventory = window.getWindowInventory(); for (int i = 0; i < inventory.getSizeInventory(); ++i) { - if (inventory.dispenseOnClose(i)) { - ItemStack stack = inventory.getStackInSlot(i); - if (stack != null) { - stack = new TransferRequest(stack, par1EntityPlayer.inventory).transfer(true); - if (stack != null) { - par1EntityPlayer.dropPlayerItemWithRandomChoice(stack, false); - } - } + if (!inventory.dispenseOnClose(i)) { + continue; + } + + ItemStack stack = inventory.getStackInSlot(i); + if (stack == null) { + continue; + } + + stack = new TransferRequest(stack, par1EntityPlayer.inventory).transfer(true); + if (stack != null) { + par1EntityPlayer.dropPlayerItemWithRandomChoice(stack, false); } } } @@ -125,8 +128,7 @@ public class ContainerCraftGUI extends Container ((CustomSlot) slot).onSlotClick(this, mouseButton, modifier, player); return player.inventory.getItemStack(); } - ItemStack stack = super.slotClick(slotNum, mouseButton, modifier, player); - return stack; + return super.slotClick(slotNum, mouseButton, modifier, player); } public void sendNBTToClient(String key, NBTTagCompound nbt) { @@ -148,6 +150,7 @@ public class ContainerCraftGUI extends Container if (request == null) { return null; } + ItemStack itemstack = request.transfer(true); Slot shiftClickedSlot = (Slot) inventorySlots.get(slotnumber); shiftClickedSlot.putStack(itemstack); @@ -159,11 +162,13 @@ public class ContainerCraftGUI extends Container if (slotnumber < 0) { return null; } + Slot shiftClickedSlot = (Slot) inventorySlots.get(slotnumber); ItemStack itemstack = null; if (shiftClickedSlot.getHasStack()) { itemstack = shiftClickedSlot.getStack().copy(); } + IInventory playerInventory = player.inventory; IInventory containerInventory = window.getInventory(); IInventory windowInventory = window.getWindowInventory(); @@ -172,13 +177,14 @@ public class ContainerCraftGUI extends Container for (int i = 0; i < 36; ++i) { target[i] = i; } + TransferRequest request; if (shiftClickedSlot.inventory == playerInventory) { request = new TransferRequest(itemstack, fromPlayer).setOrigin(shiftClickedSlot.inventory); - } - else { + } else { request = new TransferRequest(itemstack, playerInventory).setOrigin(shiftClickedSlot.inventory).setTargetSlots(target); } + if (window instanceof IWindowAffectsShiftClick) { ((IWindowAffectsShiftClick) window).alterRequest(request); } @@ -189,8 +195,13 @@ public class ContainerCraftGUI extends Container if (player.inventory.getItemStack() == null) { return null; } + ItemStack heldItem = player.inventory.getItemStack().copy(); - heldItem = new TransferRequest(heldItem, window.getInventory()).setOrigin(player.inventory).setTargetSlots(new int[0]).setTargetTanks(new int[] { slotID }).transfer(true); + heldItem = new TransferRequest(heldItem, window.getInventory()) + .setOrigin(player.inventory) + .setTargetSlots(new int[0]) + .setTargetTanks(new int[]{slotID}) + .transfer(true); player.inventory.setItemStack(heldItem); if (player instanceof EntityPlayerMP) { ((EntityPlayerMP) player).updateHeldItem(); @@ -210,22 +221,18 @@ public class ContainerCraftGUI extends Container getOrCreateSlot(InventoryType.values()[type % 4], index, slotNumber); } } + if (name.contains("tank-update")) { onTankUpdate(action); - } - else if (name.equals("power-update")) { + } else if (name.equals("power-update")) { onPowerUpdate(action); - } - else if (name.equals("process-update")) { + } else if (name.equals("process-update")) { onProcessUpdate(action); - } - else if (name.equals("error-update")) { + } else if (name.equals("error-update")) { onErrorUpdate(action); - } - else if (name.equals("mouse-over-slot")) { + } else if (name.equals("mouse-over-slot")) { onMouseOverSlot(player, action); - } - else if (name.equals("shift-click-info")) { + } else if (name.equals("shift-click-info")) { onRecieveShiftClickHighlights(player, action); } return false; @@ -247,6 +254,7 @@ public class ContainerCraftGUI extends Container } } } + if (powered != null && window.isServer()) { syncedNBT.put("power-update", createPowerNBT(powered.getPowerInfo())); } @@ -256,11 +264,13 @@ public class ContainerCraftGUI extends Container if (error != null && window.isServer()) { syncedNBT.put("error-update", createErrorNBT(error)); } + INetwork.SendGuiNBT machineSync = Machine.getInterface(INetwork.SendGuiNBT.class, window.getInventory()); if (machineSync != null) { machineSync.sendGuiNBT(syncedNBT); } - Map sentThisTime = new HashMap(); + + Map sentThisTime = new HashMap<>(); for (Map.Entry nbt : syncedNBT.entrySet()) { nbt.getValue().setString("type", nbt.getKey()); boolean shouldSend = true; @@ -268,16 +278,18 @@ public class ContainerCraftGUI extends Container if (lastSent != null) { shouldSend = !lastSent.equals(nbt.getValue()); } + if (shouldSend) { - for (int j = 0; j < crafters.size(); ++j) { - if (crafters.get(j) instanceof EntityPlayerMP) { - EntityPlayerMP player = (EntityPlayerMP) crafters.get(j); + for (Object crafter : crafters) { + if (crafter instanceof EntityPlayerMP) { + EntityPlayerMP player = (EntityPlayerMP) crafter; BinnieCore.proxy.sendToPlayer(new MessageContainerUpdate(nbt.getValue()), player); } } sentThisTime.put(nbt.getKey(), nbt.getValue()); } } + sentNBT.putAll(sentThisTime); syncedNBT.clear(); } @@ -288,11 +300,11 @@ public class ContainerCraftGUI extends Container if (error.canWork() != null) { nbt.setByte("type", (byte) 0); state = error.canWork(); - } - else if (error.canProgress() != null) { + } else if (error.canProgress() != null) { nbt.setByte("type", (byte) 1); state = error.canProgress(); } + if (state != null) { state.writeToNBT(nbt); } @@ -330,7 +342,8 @@ public class ContainerCraftGUI extends Container } public void onPowerUpdate(NBTTagCompound nbt) { - (syncedPower = new PowerInfo()).readFromNBT(nbt); + syncedPower = new PowerInfo(); + syncedPower.readFromNBT(nbt); } public PowerInfo getPowerInfo() { @@ -342,15 +355,17 @@ public class ContainerCraftGUI extends Container } public TankInfo getTankInfo(int tank) { - return syncedTanks.containsKey(tank) ? syncedTanks.get(tank) : new TankInfo(); + return syncedTanks.containsKey(tank) + ? syncedTanks.get(tank) + : new TankInfo(); } public void onErrorUpdate(NBTTagCompound nbt) { errorType = nbt.getByte("type"); if (nbt.hasKey("name")) { - (error = new ErrorState("", "")).readFromNBT(nbt); - } - else { + error = new ErrorState("", ""); + error.readFromNBT(nbt); + } else { error = null; } } @@ -364,7 +379,7 @@ public class ContainerCraftGUI extends Container } public CustomSlot[] getCustomSlots() { - List slots = new ArrayList(); + List slots = new ArrayList<>(); for (Object object : inventorySlots) { if (object instanceof CustomSlot) { slots.add((CustomSlot) object); @@ -374,13 +389,15 @@ public class ContainerCraftGUI extends Container } public void setMouseOverSlot(Slot slot) { - if (slot.slotNumber != mousedOverSlotNumber) { - mousedOverSlotNumber = slot.slotNumber; - ControlSlot.highlighting.get(EnumHighlighting.ShiftClick).clear(); - NBTTagCompound nbt = new NBTTagCompound(); - nbt.setShort("slot", (short) slot.slotNumber); - window.sendClientAction("mouse-over-slot", nbt); + if (slot.slotNumber == mousedOverSlotNumber) { + return; } + + mousedOverSlotNumber = slot.slotNumber; + ControlSlot.highlighting.get(EnumHighlighting.SHIFT_CLICK).clear(); + NBTTagCompound nbt = new NBTTagCompound(); + nbt.setShort("slot", (short) slot.slotNumber); + window.sendClientAction("mouse-over-slot", nbt); } private void onMouseOverSlot(EntityPlayer player, NBTTagCompound data) { @@ -389,28 +406,31 @@ public class ContainerCraftGUI extends Container if (request == null) { return; } + request.transfer(false); NBTTagCompound nbt = new NBTTagCompound(); - List slots = new ArrayList(); + List slots = new ArrayList<>(); for (TransferRequest.TransferSlot tslot : request.getInsertedSlots()) { Slot slot = getSlot(tslot.inventory, tslot.id); if (slot != null) { slots.add(slot.slotNumber); } } + int[] array = new int[slots.size()]; for (int i = 0; i < slots.size(); ++i) { array[i] = slots.get(i); } + nbt.setIntArray("slots", array); nbt.setShort("origin", (short) slotnumber); syncedNBT.put("shift-click-info", nbt); } private void onRecieveShiftClickHighlights(EntityPlayer player, NBTTagCompound data) { - ControlSlot.highlighting.get(EnumHighlighting.ShiftClick).clear(); + ControlSlot.highlighting.get(EnumHighlighting.SHIFT_CLICK).clear(); for (int slotnumber : data.getIntArray("slots")) { - ControlSlot.highlighting.get(EnumHighlighting.ShiftClick).add(slotnumber); + ControlSlot.highlighting.get(EnumHighlighting.SHIFT_CLICK).add(slotnumber); } } @@ -429,6 +449,7 @@ public class ContainerCraftGUI extends Container if (handleNBT(side, player, name, action)) { return; } + window.recieveGuiNBT(getSide(), player, name, action); INetwork.RecieveGuiNBT machine = Machine.getInterface(INetwork.RecieveGuiNBT.class, window.getInventory()); if (machine != null) { @@ -443,6 +464,7 @@ public class ContainerCraftGUI extends Container slot = new CustomSlot(inventory, index); addSlotToContainer(slot); } + NBTTagCompound nbt = new NBTTagCompound(); nbt.setByte("t", (byte) type.ordinal()); nbt.setShort("i", (short) index); @@ -469,6 +491,7 @@ public class ContainerCraftGUI extends Container if (inventorySlots.get(slotNumber) != null) { return null; } + Slot slot = new CustomSlot(inventory, index); slot.slotNumber = slotNumber; inventorySlots.add(slotNumber, slot); diff --git a/src/main/java/binnie/core/craftgui/minecraft/CustomSlot.java b/src/main/java/binnie/core/craftgui/minecraft/CustomSlot.java index bb0b5d03..72cd30ac 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/CustomSlot.java +++ b/src/main/java/binnie/core/craftgui/minecraft/CustomSlot.java @@ -8,17 +8,16 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -public class CustomSlot extends Slot -{ +public class CustomSlot extends Slot { + public CustomSlot(IInventory inventory, int index) { + super(inventory, index, 0, 0); + } + @Override public boolean isItemValid(ItemStack par1ItemStack) { return inventory.isItemValidForSlot(getSlotIndex(), par1ItemStack); } - public CustomSlot(IInventory inventory, int index) { - super(inventory, index, 0, 0); - } - public InventorySlot getInventorySlot() { IInventorySlots slots = Machine.getInterface(IInventorySlots.class, inventory); if (slots != null) { @@ -36,8 +35,7 @@ public class CustomSlot extends Slot ItemStack stack = player.inventory.getItemStack(); if (stack == null || mouseButton == 2) { putStack(null); - } - else { + } else { stack = stack.copy(); stack.stackSize = 1; putStack(stack); diff --git a/src/main/java/binnie/core/craftgui/minecraft/Dialog.java b/src/main/java/binnie/core/craftgui/minecraft/Dialog.java index 10d57a7b..e11d8b6e 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/Dialog.java +++ b/src/main/java/binnie/core/craftgui/minecraft/Dialog.java @@ -9,23 +9,14 @@ import binnie.core.craftgui.events.EventMouse; import binnie.core.craftgui.geometry.IPoint; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; -public abstract class Dialog extends Control -{ +public abstract class Dialog extends Control { public Dialog(IWidget parent, float w, float h) { super(parent, (parent.w() - w) / 2.0f, (parent.h() - h) / 2.0f, w, h); - addAttribute(WidgetAttribute.MouseOver); - addAttribute(WidgetAttribute.AlwaysOnTop); - addAttribute(WidgetAttribute.BlockTooltip); + addAttribute(WidgetAttribute.MOUSE_OVER); + addAttribute(WidgetAttribute.ALWAYS_ON_TOP); + addAttribute(WidgetAttribute.BLOCK_TOOLTIP); initialise(); - addEventHandler(new EventMouse.Down.Handler() { - @Override - public void onEvent(EventMouse.Down event) { - if (!getArea().contains(getRelativeMousePosition())) { - onClose(); - getParent().deleteChild(Dialog.this); - } - } - }.setOrigin(EventHandler.Origin.Any, this)); + addEventHandler(new MouseDownHandler().setOrigin(EventHandler.Origin.Any, this)); } @Override @@ -44,4 +35,14 @@ public abstract class Dialog extends Control public boolean isMouseOverWidget(IPoint relativeMouse) { return true; } + + private class MouseDownHandler extends EventMouse.Down.Handler { + @Override + public void onEvent(EventMouse.Down event) { + if (!getArea().contains(getRelativeMousePosition())) { + onClose(); + getParent().deleteChild(Dialog.this); + } + } + } } diff --git a/src/main/java/binnie/core/craftgui/minecraft/GUIIcon.java b/src/main/java/binnie/core/craftgui/minecraft/GUIIcon.java index 18e6eb81..8e8dd48b 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/GUIIcon.java +++ b/src/main/java/binnie/core/craftgui/minecraft/GUIIcon.java @@ -5,8 +5,7 @@ import binnie.core.BinnieCore; import binnie.core.resource.BinnieIcon; import net.minecraft.util.IIcon; -public enum GUIIcon -{ +public enum GUIIcon { ArrowUp("arrow-up"), ArrowDown("arrow-down"), ArrowLeft("arrow-left"), diff --git a/src/main/java/binnie/core/craftgui/minecraft/GuiCraftGUI.java b/src/main/java/binnie/core/craftgui/minecraft/GuiCraftGUI.java index 8a02e129..dc4f5297 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/GuiCraftGUI.java +++ b/src/main/java/binnie/core/craftgui/minecraft/GuiCraftGUI.java @@ -33,12 +33,16 @@ import java.util.ArrayList; import java.util.List; @SideOnly(Side.CLIENT) -public class GuiCraftGUI extends GuiContainer -{ - IPoint mousePos; +public class GuiCraftGUI extends GuiContainer { private Window window; private ItemStack draggedItem; + public GuiCraftGUI(Window window) { + super(window.getContainer()); + this.window = window; + resize(window.getSize()); + } + @Override public void updateScreen() { window.updateClient(); @@ -48,15 +52,9 @@ public class GuiCraftGUI extends GuiContainer return mc; } - public GuiCraftGUI(Window window) { - super(window.getContainer()); - mousePos = new IPoint(0.0f, 0.0f); - this.window = window; - resize(window.getSize()); - } - @Override protected void drawGuiContainerBackgroundLayer(float var1, int var2, int var3) { + // ignored } @Override @@ -104,11 +102,10 @@ public class GuiCraftGUI extends GuiContainer GL11.glDisable(2929); MinecraftTooltip tooltip = new MinecraftTooltip(); if (isHelpMode()) { - tooltip.setType(Tooltip.Type.Help); + tooltip.setType(Tooltip.Type.HELP); window.getHelpTooltip(tooltip); - } - else { - tooltip.setType(Tooltip.Type.Standard); + } else { + tooltip.setType(Tooltip.Type.STANDARD); window.getTooltip(tooltip); } if (tooltip.exists()) { @@ -133,8 +130,7 @@ public class GuiCraftGUI extends GuiContainer if (string != null) { if (!string.contains("~~~")) { strings.addAll(font.listFormattedStringToWidth(string, tooltip.maxWidth)); - } - else { + } else { strings.add(string); } } @@ -178,8 +174,7 @@ public class GuiCraftGUI extends GuiContainer String s2 = strings.get(k3); if (k3 == 0) { s2 = MinecraftTooltip.getTitle(tooltip.getType()) + s2; - } - else { + } else { s2 = MinecraftTooltip.getBody(tooltip.getType()) + s2; } if (s2.contains("~~~")) { @@ -239,8 +234,7 @@ public class GuiCraftGUI extends GuiContainer if (button == -1) { float dx = Mouse.getEventDX() * width / (float) mc.displayWidth; float dy = -(Mouse.getEventDY() * height / (float) mc.displayHeight); - } - else { + } else { window.callEvent(new EventMouse.Up(origin, x, y, button)); } } diff --git a/src/main/java/binnie/core/craftgui/minecraft/IMachineInformation.java b/src/main/java/binnie/core/craftgui/minecraft/IMachineInformation.java index 8c191e69..f0670ca8 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/IMachineInformation.java +++ b/src/main/java/binnie/core/craftgui/minecraft/IMachineInformation.java @@ -1,6 +1,5 @@ package binnie.core.craftgui.minecraft; -public interface IMachineInformation -{ +public interface IMachineInformation { String getInformation(); } diff --git a/src/main/java/binnie/core/craftgui/minecraft/IMinecraftTooltip.java b/src/main/java/binnie/core/craftgui/minecraft/IMinecraftTooltip.java index aac27124..d5d9dd24 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/IMinecraftTooltip.java +++ b/src/main/java/binnie/core/craftgui/minecraft/IMinecraftTooltip.java @@ -2,7 +2,6 @@ package binnie.core.craftgui.minecraft; import binnie.core.craftgui.ITooltip; -public interface IMinecraftTooltip extends ITooltip -{ +public interface IMinecraftTooltip extends ITooltip { void getTooltip(MinecraftTooltip p0); } diff --git a/src/main/java/binnie/core/craftgui/minecraft/IWindowAffectsShiftClick.java b/src/main/java/binnie/core/craftgui/minecraft/IWindowAffectsShiftClick.java index 6defad37..4f89251c 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/IWindowAffectsShiftClick.java +++ b/src/main/java/binnie/core/craftgui/minecraft/IWindowAffectsShiftClick.java @@ -2,7 +2,6 @@ package binnie.core.craftgui.minecraft; import binnie.core.machines.transfer.TransferRequest; -public interface IWindowAffectsShiftClick -{ +public interface IWindowAffectsShiftClick { void alterRequest(TransferRequest p0); } diff --git a/src/main/java/binnie/core/craftgui/minecraft/InventoryType.java b/src/main/java/binnie/core/craftgui/minecraft/InventoryType.java index 4d5e1b2d..3529bf58 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/InventoryType.java +++ b/src/main/java/binnie/core/craftgui/minecraft/InventoryType.java @@ -1,7 +1,6 @@ package binnie.core.craftgui.minecraft; -public enum InventoryType -{ +public enum InventoryType { Player, Machine, Window, diff --git a/src/main/java/binnie/core/craftgui/minecraft/ListMap.java b/src/main/java/binnie/core/craftgui/minecraft/ListMap.java index 5cd3dd30..54862290 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/ListMap.java +++ b/src/main/java/binnie/core/craftgui/minecraft/ListMap.java @@ -7,8 +7,7 @@ import java.util.List; import java.util.ListIterator; import java.util.Map; -class ListMap implements List -{ +class ListMap implements List { private LinkedHashMap map; ListMap() { diff --git a/src/main/java/binnie/core/craftgui/minecraft/MinecraftTooltip.java b/src/main/java/binnie/core/craftgui/minecraft/MinecraftTooltip.java index 0173a313..208c2b6d 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/MinecraftTooltip.java +++ b/src/main/java/binnie/core/craftgui/minecraft/MinecraftTooltip.java @@ -3,8 +3,7 @@ package binnie.core.craftgui.minecraft; import binnie.core.craftgui.Tooltip; import net.minecraft.util.EnumChatFormatting; -public class MinecraftTooltip extends Tooltip -{ +public class MinecraftTooltip extends Tooltip { public static int getOutline(ITooltipType type) { return TypeColour.valueOf(type.toString()).getOutline(); } @@ -17,14 +16,12 @@ public class MinecraftTooltip extends Tooltip return TypeColour.valueOf(type.toString()).getBody(); } - public enum Type implements ITooltipType - { - Error, - Warning + public enum Type implements ITooltipType { + ERROR, + WARNING } - private enum TypeColour - { + private enum TypeColour { Standard(5243135, EnumChatFormatting.WHITE, EnumChatFormatting.GRAY), Help(5046016, EnumChatFormatting.GREEN, EnumChatFormatting.DARK_GREEN), Information(49151, EnumChatFormatting.AQUA, EnumChatFormatting.DARK_AQUA), diff --git a/src/main/java/binnie/core/craftgui/minecraft/ModuleCraftGUI.java b/src/main/java/binnie/core/craftgui/minecraft/ModuleCraftGUI.java index a803f3d2..695c8816 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/ModuleCraftGUI.java +++ b/src/main/java/binnie/core/craftgui/minecraft/ModuleCraftGUI.java @@ -2,8 +2,7 @@ package binnie.core.craftgui.minecraft; import binnie.core.IInitializable; -public class ModuleCraftGUI implements IInitializable -{ +public class ModuleCraftGUI implements IInitializable { @Override public void preInit() { } diff --git a/src/main/java/binnie/core/craftgui/minecraft/Window.java b/src/main/java/binnie/core/craftgui/minecraft/Window.java index ffbc9c4b..c8383495 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/Window.java +++ b/src/main/java/binnie/core/craftgui/minecraft/Window.java @@ -45,12 +45,12 @@ import java.util.ArrayList; import java.util.Deque; public abstract class Window extends TopLevelWidget implements INetwork.RecieveGuiNBT { + protected float titleButtonLeft; + protected float titleButtonRight; private GuiCraftGUI gui; private ContainerCraftGUI container; private WindowInventory windowInventory; private ControlText title; - protected float titleButtonLeft; - protected float titleButtonRight; private StandardTexture bgText1; private StandardTexture bgText2; private boolean hasBeenInitialised; @@ -58,67 +58,6 @@ public abstract class Window extends TopLevelWidget implements INetwork.RecieveG private IInventory entityInventory; private Side side; - public void getTooltip(Tooltip tooltip) { - Deque queue = calculateMousedOverWidgets(); - while (!queue.isEmpty()) { - IWidget widget = queue.removeFirst(); - if (widget.isEnabled() && widget.isVisible()) { - if (!widget.calculateIsMouseOver()) { - continue; - } - if (widget instanceof ITooltip) { - ((ITooltip) widget).getTooltip(tooltip); - if (tooltip.exists()) { - return; - } - } - if (widget.hasAttribute(WidgetAttribute.BlockTooltip)) { - return; - } - } - } - } - - public void getHelpTooltip(MinecraftTooltip tooltip) { - Deque queue = calculateMousedOverWidgets(); - while (!queue.isEmpty()) { - IWidget widget = queue.removeFirst(); - if (widget.isEnabled() && widget.isVisible()) { - if (!widget.calculateIsMouseOver()) { - continue; - } - if (widget instanceof ITooltipHelp) { - ((ITooltipHelp) widget).getHelpTooltip(tooltip); - if (tooltip.exists()) { - return; - } - } - if (widget.hasAttribute(WidgetAttribute.BlockTooltip)) { - return; - } - } - } - } - - protected abstract AbstractMod getMod(); - - protected abstract String getName(); - - public BinnieResource getBackgroundTextureFile(int i) { - return Binnie.Resource.getPNG(getMod(), ResourceType.GUI, getName() + ((i == 1) ? "" : i)); - } - - public boolean showHelpButton() { - return Machine.getInterface(IInventoryMachine.class, getInventory()) != null; - } - - public String showInfoButton() { - if (Machine.getInterface(IMachineInformation.class, getInventory()) != null) { - return Machine.getInterface(IMachineInformation.class, getInventory()).getInformation(); - } - return null; - } - public Window(float width, float height, EntityPlayer player, IInventory inventory, Side side) { this.side = side; titleButtonLeft = 8.0f; @@ -163,6 +102,71 @@ public abstract class Window extends TopLevelWidget implements INetwork.RecieveG }); } + public static T get(IWidget widget) { + return (T) widget.getSuperParent(); + } + + public void getTooltip(Tooltip tooltip) { + Deque queue = calculateMousedOverWidgets(); + while (!queue.isEmpty()) { + IWidget widget = queue.removeFirst(); + if (widget.isEnabled() && widget.isVisible()) { + if (!widget.calculateIsMouseOver()) { + continue; + } + if (widget instanceof ITooltip) { + ((ITooltip) widget).getTooltip(tooltip); + if (tooltip.exists()) { + return; + } + } + if (widget.hasAttribute(WidgetAttribute.BLOCK_TOOLTIP)) { + return; + } + } + } + } + + public void getHelpTooltip(MinecraftTooltip tooltip) { + Deque queue = calculateMousedOverWidgets(); + while (!queue.isEmpty()) { + IWidget widget = queue.removeFirst(); + if (widget.isEnabled() && widget.isVisible()) { + if (!widget.calculateIsMouseOver()) { + continue; + } + if (widget instanceof ITooltipHelp) { + ((ITooltipHelp) widget).getHelpTooltip(tooltip); + if (tooltip.exists()) { + return; + } + } + if (widget.hasAttribute(WidgetAttribute.BLOCK_TOOLTIP)) { + return; + } + } + } + } + + protected abstract AbstractMod getMod(); + + protected abstract String getName(); + + public BinnieResource getBackgroundTextureFile(int i) { + return Binnie.Resource.getPNG(getMod(), ResourceType.GUI, getName() + ((i == 1) ? "" : i)); + } + + public boolean showHelpButton() { + return Machine.getInterface(IInventoryMachine.class, getInventory()) != null; + } + + public String showInfoButton() { + if (Machine.getInterface(IMachineInformation.class, getInventory()) != null) { + return Machine.getInterface(IMachineInformation.class, getInventory()).getInformation(); + } + return null; + } + public void setTitle(String title) { this.title = new ControlTextCentered(this, 12.0f, title); this.title.setColor(0x404040); @@ -220,7 +224,7 @@ public abstract class Window extends TopLevelWidget implements INetwork.RecieveG @Override public void onUpdateClient() { - ControlSlot.highlighting.get(EnumHighlighting.Help).clear(); + ControlSlot.highlighting.get(EnumHighlighting.HELP).clear(); ControlSlot.shiftClickActive = false; } @@ -239,6 +243,12 @@ public abstract class Window extends TopLevelWidget implements INetwork.RecieveG return null; } + public void setHeldItemStack(ItemStack stack) { + if (player != null) { + player.inventory.setItemStack(stack); + } + } + public IInventory getInventory() { return entityInventory; } @@ -251,12 +261,6 @@ public abstract class Window extends TopLevelWidget implements INetwork.RecieveG public void onClose() { } - public void setHeldItemStack(ItemStack stack) { - if (player != null) { - player.inventory.setItemStack(stack); - } - } - public boolean isServer() { return !isClient(); } @@ -307,8 +311,4 @@ public abstract class Window extends TopLevelWidget implements INetwork.RecieveG public Texture getBackground2() { return bgText2; } - - public static T get(IWidget widget) { - return (T) widget.getSuperParent(); - } } diff --git a/src/main/java/binnie/core/craftgui/minecraft/WindowInventory.java b/src/main/java/binnie/core/craftgui/minecraft/WindowInventory.java index 1fc8d8dd..ca989435 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/WindowInventory.java +++ b/src/main/java/binnie/core/craftgui/minecraft/WindowInventory.java @@ -10,17 +10,16 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -public class WindowInventory implements IInventory -{ +public class WindowInventory implements IInventory { private Window window; private Map inventory; private Map validators; private List disabledAutoDispenses; public WindowInventory(Window window) { - inventory = new HashMap(); - validators = new HashMap(); - disabledAutoDispenses = new ArrayList(); + inventory = new HashMap<>(); + validators = new HashMap<>(); + disabledAutoDispenses = new ArrayList<>(); this.window = window; } @@ -29,6 +28,7 @@ public class WindowInventory implements IInventory if (inventory.size() == 0) { return 0; } + int max = 0; for (int i : inventory.keySet()) { if (i > max) { @@ -48,22 +48,24 @@ public class WindowInventory implements IInventory @Override public ItemStack decrStackSize(int index, int amount) { - if (inventory.containsKey(index)) { - ItemStack item = inventory.get(index); - ItemStack output = item.copy(); - int available = item.stackSize; - if (amount > available) { - amount = available; - } - ItemStack itemStack = item; - itemStack.stackSize -= amount; - output.stackSize = amount; - if (item.stackSize == 0) { - setInventorySlotContents(index, null); - } - return output; + if (!inventory.containsKey(index)) { + return null; } - return null; + + ItemStack item = inventory.get(index); + ItemStack output = item.copy(); + int available = item.stackSize; + if (amount > available) { + amount = available; + } + + ItemStack itemStack = item; + itemStack.stackSize -= amount; + output.stackSize = amount; + if (item.stackSize == 0) { + setInventorySlotContents(index, null); + } + return output; } @Override diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlEnergyBar.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlEnergyBar.java index 02b270a5..623a56e9 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlEnergyBar.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlEnergyBar.java @@ -29,7 +29,7 @@ public class ControlEnergyBar extends Control implements ITooltip { public ControlEnergyBar(IWidget parent, int x, int y, int width, int height, Position direction) { super(parent, x, y, width, height); this.direction = direction; - addAttribute(WidgetAttribute.MouseOver); + addAttribute(WidgetAttribute.MOUSE_OVER); } public IPoweredMachine getClientPower() { @@ -105,10 +105,10 @@ public class ControlEnergyBar extends Control implements ITooltip { } if (isMouseOver() && Window.get(this).getGui().isHelpMode()) { - int c = 0xaa000000 + MinecraftTooltip.getOutline(Tooltip.Type.Help); + int c = 0xaa000000 + MinecraftTooltip.getOutline(Tooltip.Type.HELP); CraftGUI.Render.gradientRect(getArea().inset(1), c, c); } else if (ControlEnergyBar.isError) { - int c = 0xaa000000 + MinecraftTooltip.getOutline(MinecraftTooltip.Type.Error); + int c = 0xaa000000 + MinecraftTooltip.getOutline(MinecraftTooltip.Type.ERROR); CraftGUI.Render.gradientRect(getArea().inset(1), c, c); } @@ -121,11 +121,11 @@ public class ControlEnergyBar extends Control implements ITooltip { public void onRenderForeground() { if (isMouseOver() && Window.get(this).getGui().isHelpMode()) { IArea area = getArea(); - CraftGUI.Render.colour(MinecraftTooltip.getOutline(Tooltip.Type.Help)); + CraftGUI.Render.colour(MinecraftTooltip.getOutline(Tooltip.Type.HELP)); CraftGUI.Render.texture(CraftGUITexture.Outline, area.outset(1)); } else if (ControlEnergyBar.isError) { IArea area = getArea(); - CraftGUI.Render.colour(MinecraftTooltip.getOutline(MinecraftTooltip.Type.Error)); + CraftGUI.Render.colour(MinecraftTooltip.getOutline(MinecraftTooltip.Type.ERROR)); CraftGUI.Render.texture(CraftGUITexture.Outline, area.outset(1)); } } diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlErrorState.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlErrorState.java index db8c877e..d7470735 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlErrorState.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlErrorState.java @@ -18,6 +18,12 @@ public class ControlErrorState extends Control implements ITooltip { private ErrorState errorState; private int type; + public ControlErrorState(IWidget parent, float x, float y) { + super(parent, x, y, 16.0f, 16.0f); + type = 0; + addAttribute(WidgetAttribute.MOUSE_OVER); + } + @Override public void onRenderBackground() { Object texture = CraftGUITexture.StateWarning; @@ -38,8 +44,8 @@ public class ControlErrorState extends Control implements ITooltip { public void onUpdateClient() { errorState = getError(); type = Window.get(this).getContainer().getErrorType(); - ControlSlot.highlighting.get(EnumHighlighting.Error).clear(); - ControlSlot.highlighting.get(EnumHighlighting.Warning).clear(); + ControlSlot.highlighting.get(EnumHighlighting.ERROR).clear(); + ControlSlot.highlighting.get(EnumHighlighting.WARNING).clear(); ControlLiquidTank.tankError.clear(); ControlEnergyBar.isError = false; @@ -58,9 +64,9 @@ public class ControlErrorState extends Control implements ITooltip { } if (id >= 0) { if (type == 0) { - ControlSlot.highlighting.get(EnumHighlighting.Error).add(id); + ControlSlot.highlighting.get(EnumHighlighting.ERROR).add(id); } else { - ControlSlot.highlighting.get(EnumHighlighting.Warning).add(id); + ControlSlot.highlighting.get(EnumHighlighting.WARNING).add(id); } } } @@ -73,12 +79,6 @@ public class ControlErrorState extends Control implements ITooltip { } } - public ControlErrorState(IWidget parent, float x, float y) { - super(parent, x, y, 16.0f, 16.0f); - type = 0; - addAttribute(WidgetAttribute.MouseOver); - } - @Override public void getTooltip(Tooltip tooltipOrig) { MinecraftTooltip tooltip = (MinecraftTooltip) tooltipOrig; @@ -87,9 +87,9 @@ public class ControlErrorState extends Control implements ITooltip { } if (type == 0) { - tooltip.setType(MinecraftTooltip.Type.Error); + tooltip.setType(MinecraftTooltip.Type.ERROR); } else { - tooltip.setType(MinecraftTooltip.Type.Warning); + tooltip.setType(MinecraftTooltip.Type.WARNING); } tooltip.add(errorState.toString()); @@ -97,8 +97,4 @@ public class ControlErrorState extends Control implements ITooltip { tooltip.add(errorState.getTooltip()); } } - - public ErrorState getErrorState() { - return errorState; - } } diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlHelp.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlHelp.java index 57b7db8c..915441e4 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlHelp.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlHelp.java @@ -13,7 +13,7 @@ import binnie.core.util.I18N; public class ControlHelp extends Control implements ITooltip { public ControlHelp(IWidget parent, float x, float y) { super(parent, x, y, 16.0f, 16.0f); - addAttribute(WidgetAttribute.MouseOver); + addAttribute(WidgetAttribute.MOUSE_OVER); } @Override @@ -23,7 +23,7 @@ public class ControlHelp extends Control implements ITooltip { @Override public void getTooltip(Tooltip tooltip) { - tooltip.setType(Tooltip.Type.Help); + tooltip.setType(Tooltip.Type.HELP); tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.help")); tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.help.0")); tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.help.1")); diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlInfo.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlInfo.java index aea1720a..01d9ba8b 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlInfo.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlInfo.java @@ -16,7 +16,7 @@ public class ControlInfo extends Control implements ITooltip { public ControlInfo(IWidget parent, float x, float y, String info) { super(parent, x, y, 16.0f, 16.0f); this.info = info; - addAttribute(WidgetAttribute.MouseOver); + addAttribute(WidgetAttribute.MOUSE_OVER); } @Override @@ -26,7 +26,7 @@ public class ControlInfo extends Control implements ITooltip { @Override public void getTooltip(Tooltip tooltip) { - tooltip.setType(Tooltip.Type.Information); + tooltip.setType(Tooltip.Type.INFORMATION); tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.info")); tooltip.add(info); tooltip.setMaxWidth(200); diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlItemDisplay.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlItemDisplay.java index 36852998..233ea9c0 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlItemDisplay.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlItemDisplay.java @@ -14,15 +14,10 @@ import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; public class ControlItemDisplay extends Control implements ITooltip { - private ItemStack itemStack; public boolean hastooltip; + private ItemStack itemStack; private boolean rotating; - public void setTooltip() { - hastooltip = true; - addAttribute(WidgetAttribute.MouseOver); - } - public ControlItemDisplay(IWidget parent, float x, float y) { this(parent, x, y, 16.0f); } @@ -42,10 +37,16 @@ public class ControlItemDisplay extends Control implements ITooltip { rotating = false; } + public void setTooltip() { + hastooltip = true; + addAttribute(WidgetAttribute.MOUSE_OVER); + } + @Override public void onRenderBackground() { IPoint relativeToWindow = getAbsolutePosition().sub(getSuperParent().getPosition()); - if (relativeToWindow.x() > Window.get(this).getSize().x() + 100.0f || relativeToWindow.y() > Window.get(this).getSize().y() + 100.0f) { + if (relativeToWindow.x() > Window.get(this).getSize().x() + 100.0f || + relativeToWindow.y() > Window.get(this).getSize().y() + 100.0f) { return; } @@ -66,14 +67,14 @@ public class ControlItemDisplay extends Control implements ITooltip { } } - public void setItemStack(ItemStack itemStack) { - this.itemStack = itemStack; - } - public ItemStack getItemStack() { return itemStack; } + public void setItemStack(ItemStack itemStack) { + this.itemStack = itemStack; + } + @Override public void getTooltip(Tooltip tooltip) { if (hastooltip && itemStack != null) { diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlLiquidTank.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlLiquidTank.java index 9b4049be..aef56726 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlLiquidTank.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlLiquidTank.java @@ -41,7 +41,7 @@ public class ControlLiquidTank extends Control implements ITooltip { super(parent, x, y, horizontal ? 60.0f : 18.0f, horizontal ? 18.0f : 60.0f); tankID = 0; this.horizontal = horizontal; - addAttribute(WidgetAttribute.MouseOver); + addAttribute(WidgetAttribute.MOUSE_OVER); addSelfEventHandler(new EventMouse.Down.Handler() { @Override public void onEvent(EventMouse.Down event) { @@ -74,10 +74,10 @@ public class ControlLiquidTank extends Control implements ITooltip { public void onRenderBackground() { CraftGUI.Render.texture(horizontal ? CraftGUITexture.HorizontalLiquidTank : CraftGUITexture.LiquidTank, IPoint.ZERO); if (isMouseOver() && Window.get(this).getGui().isHelpMode()) { - int c = 0xaa000000 + MinecraftTooltip.getOutline(Tooltip.Type.Help); + int c = 0xaa000000 + MinecraftTooltip.getOutline(Tooltip.Type.HELP); CraftGUI.Render.gradientRect(getArea().inset(1), c, c); } else if (ControlLiquidTank.tankError.contains(tankID)) { - int c = 0xaa000000 + MinecraftTooltip.getOutline(MinecraftTooltip.Type.Error); + int c = 0xaa000000 + MinecraftTooltip.getOutline(MinecraftTooltip.Type.ERROR); CraftGUI.Render.gradientRect(getArea().inset(1), c, c); } else if (getSuperParent().getMousedOverWidget() == this) { if (Window.get(this).getGui().getDraggedItem() != null) { @@ -125,13 +125,13 @@ public class ControlLiquidTank extends Control implements ITooltip { CraftGUI.Render.texture(horizontal ? CraftGUITexture.HorizontalLiquidTankOverlay : CraftGUITexture.LiquidTankOverlay, IPoint.ZERO); if (isMouseOver() && Window.get(this).getGui().isHelpMode()) { IArea area = getArea(); - CraftGUI.Render.colour(MinecraftTooltip.getOutline(Tooltip.Type.Help)); + CraftGUI.Render.colour(MinecraftTooltip.getOutline(Tooltip.Type.HELP)); CraftGUI.Render.texture(CraftGUITexture.Outline, area.outset(1)); } if (ControlLiquidTank.tankError.contains(tankID)) { IArea area = getArea(); - CraftGUI.Render.colour(MinecraftTooltip.getOutline(MinecraftTooltip.Type.Error)); + CraftGUI.Render.colour(MinecraftTooltip.getOutline(MinecraftTooltip.Type.ERROR)); CraftGUI.Render.texture(CraftGUITexture.Outline, area.outset(1)); } } @@ -151,7 +151,7 @@ public class ControlLiquidTank extends Control implements ITooltip { if (slot.isReadOnly()) { tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.tank.outputOnlyTank")); } - + if (slot.getValidator() == null) { tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.tank.acceptsAny")); } else { diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlPlayerInventory.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlPlayerInventory.java index 29ef2b3c..f7f7322f 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlPlayerInventory.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlPlayerInventory.java @@ -3,8 +3,6 @@ package binnie.core.craftgui.minecraft.control; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.minecraft.InventoryType; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; import java.util.ArrayList; import java.util.List; @@ -66,24 +64,6 @@ public class ControlPlayerInventory extends Control { } } - public void addItem(ItemStack item) { - if (item == null) { - return; - } - - for (ControlSlot slot : slots) { - if (!slot.slot.getHasStack()) { - slot.slot.putStack(item); - } - } - } - - public void addInventory(IInventory inventory) { - for (int i = 0; i < inventory.getSizeInventory(); ++i) { - addItem(inventory.getStackInSlot(i)); - } - } - public ControlSlot getSlot(int i) { if (i < 0 || i >= slots.size()) { return null; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlPowerSystem.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlPowerSystem.java index 2f1a24e7..55956946 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlPowerSystem.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlPowerSystem.java @@ -16,7 +16,7 @@ public class ControlPowerSystem extends Control implements ITooltip { public ControlPowerSystem(IWidget parent, float x, float y, PowerSystem system) { super(parent, x, y, 16.0f, 16.0f); - addAttribute(WidgetAttribute.MouseOver); + addAttribute(WidgetAttribute.MOUSE_OVER); this.system = system; } @@ -27,7 +27,7 @@ public class ControlPowerSystem extends Control implements ITooltip { @Override public void getTooltip(Tooltip tooltip) { - tooltip.setType(Tooltip.Type.Power); + tooltip.setType(Tooltip.Type.POWER); tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.powerSupply")); tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.poweredBy", system.getUnitName())); tooltip.setMaxWidth(200); diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlProgressBase.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlProgressBase.java index c9c83b34..1bc4c3c7 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlProgressBase.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlProgressBase.java @@ -1,5 +1,6 @@ package binnie.core.craftgui.minecraft.control; +import binnie.core.BinnieCore; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.Tooltip; import binnie.core.craftgui.WidgetAttribute; @@ -8,6 +9,7 @@ import binnie.core.craftgui.minecraft.Window; import binnie.core.machines.Machine; import binnie.core.machines.power.IProcess; import binnie.core.machines.power.ProcessInfo; +import binnie.core.util.I18N; public class ControlProgressBase extends Control { protected float progress; @@ -15,7 +17,37 @@ public class ControlProgressBase extends Control { public ControlProgressBase(IWidget parent, float x, float y, float w, float h) { super(parent, x, y, w, h); progress = 0.0f; - addAttribute(WidgetAttribute.MouseOver); + addAttribute(WidgetAttribute.MOUSE_OVER); + } + + public static String convertTime(int time) { + int seconds = (int) (time / 20.0f); + int minutes = 0; + while (seconds >= 60) { + minutes++; + seconds -= 60; + } + + String ts = ""; + if (minutes > 0) { + if (minutes == 1) { + ts += I18N.localise(BinnieCore.instance, "gui.database.time.minute"); + } else { + ts += I18N.localise(BinnieCore.instance, "gui.database.time.minutes", minutes); + } + } + + if (seconds > 0) { + if (ts.length() > 0) { + ts += " "; + } + if (seconds == 1) { + ts += I18N.localise(BinnieCore.instance, "gui.database.time.second"); + } else { + ts += I18N.localise(BinnieCore.instance, "gui.database.time.seconds", seconds); + } + } + return ts; } public void setProgress(float progress) { @@ -43,45 +75,26 @@ public class ControlProgressBase extends Control { public void getHelpTooltip(Tooltip tooltip) { ProcessInfo process = getProcess(); IProcess machineProcess = Machine.getMachine(Window.get(this).getInventory()).getInterface(IProcess.class); - if (process != null) { - tooltip.add("Progress"); - if (progress == 0.0f) { - tooltip.add("Not in Progress"); - } else if (process.getProcessTime() > 0) { - tooltip.add(machineProcess.getTooltip() + " (" + (int) process.getCurrentProgress() + "%)"); - } else { - tooltip.add("In Progress"); - } - - if (process.getProcessTime() > 0) { - tooltip.add("Time Left: " + convertTime((int) ((1.0f - progress) * process.getProcessTime()))); - tooltip.add("Total Time: " + convertTime(process.getProcessTime())); - tooltip.add("Energy Cost: " + process.getProcessEnergy() * 10 + " RF"); - } else { - tooltip.add("Energy Cost: " + process.getEnergyPerTick() * 10.0f + " RF / tick"); - } - } - } - - public static String convertTime(int time) { - int seconds = (int) (time / 20.0f); - int minutes = 0; - while (seconds >= 60) { - minutes++; - seconds -= 60; + if (process == null) { + return; } - String ts = ""; - if (minutes > 0) { - ts = ts + minutes + " minute" + ((minutes == 1) ? "" : "s"); + tooltip.add(I18N.localise(BinnieCore.instance, "gui.database.time.progress")); + + if (progress == 0.0f) { + tooltip.add(I18N.localise(BinnieCore.instance, "gui.database.time.notInProgress")); + } else if (process.getProcessTime() > 0) { + tooltip.add(machineProcess.getTooltip() + " (" + (int) process.getCurrentProgress() + "%)"); + } else { + tooltip.add(I18N.localise(BinnieCore.instance, "gui.database.time.inProgress")); } - if (seconds > 0) { - if (ts.length() > 0) { - ts += " "; - } - ts = ts + seconds + " second" + ((seconds == 1) ? "" : "s"); + if (process.getProcessTime() > 0) { + tooltip.add(I18N.localise(BinnieCore.instance, "gui.database.time.left", convertTime((int) ((1.0f - progress) * process.getProcessTime())))); + tooltip.add(I18N.localise(BinnieCore.instance, "gui.database.time.total", convertTime(process.getProcessTime()))); + tooltip.add(I18N.localise(BinnieCore.instance, "gui.database.energyCost.0", process.getProcessEnergy() * 10)); + } else { + tooltip.add(I18N.localise(BinnieCore.instance, "gui.database.energyCost.1", process.getEnergyPerTick() * 10.0f)); } - return ts; } } diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlide.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlide.java index cc49d57b..02dae281 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlide.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlide.java @@ -24,8 +24,8 @@ public class ControlSlide extends Control { super(parent, x, y, w, h); slideActive = true; label = null; - addAttribute(WidgetAttribute.MouseOver); - addAttribute(WidgetAttribute.BlockTooltip); + addAttribute(WidgetAttribute.MOUSE_OVER); + addAttribute(WidgetAttribute.BLOCK_TOOLTIP); expanded = new IArea(getPosition(), getSize()); anchor = anchor2.opposite(); float border = (anchor.x() != 0) ? (expanded.w() - 6.0f) : (expanded.h() - 6.0f); diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlot.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlot.java index a229b8b4..65c7f967 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlot.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlot.java @@ -31,6 +31,13 @@ import java.util.Map; public class ControlSlot extends ControlSlotBase { public static Map> highlighting = new HashMap<>(); public static boolean shiftClickActive = false; + + static { + for (EnumHighlighting h : EnumHighlighting.values()) { + ControlSlot.highlighting.put(h, new ArrayList<>()); + } + } + public Slot slot; public ControlSlot(IWidget parent, float x, float y) { @@ -75,7 +82,7 @@ public class ControlSlot extends ControlSlotBase { boolean highlighted = false; for (Map.Entry> highlight : ControlSlot.highlighting.entrySet()) { - if (highlight.getKey() == EnumHighlighting.ShiftClick && !ControlSlot.shiftClickActive) { + if (highlight.getKey() == EnumHighlighting.SHIFT_CLICK && !ControlSlot.shiftClickActive) { continue; } if (highlighted || !highlight.getValue().contains(slot.slotNumber)) { @@ -103,7 +110,7 @@ public class ControlSlot extends ControlSlotBase { boolean highlighted = false; for (Map.Entry> highlight : ControlSlot.highlighting.entrySet()) { - if (highlight.getKey() == EnumHighlighting.ShiftClick && !ControlSlot.shiftClickActive) { + if (highlight.getKey() == EnumHighlighting.SHIFT_CLICK && !ControlSlot.shiftClickActive) { continue; } if (highlighted || !highlight.getValue().contains(slot.slotNumber)) { @@ -137,7 +144,7 @@ public class ControlSlot extends ControlSlotBase { if (Window.get(this).getGui().isHelpMode() && isMouseOver()) { for (ControlSlot slot2 : getControlSlots()) { if (slot2.slot != null) { - ControlSlot.highlighting.get(EnumHighlighting.Help).add(slot2.slot.slotNumber); + ControlSlot.highlighting.get(EnumHighlighting.HELP).add(slot2.slot.slotNumber); } } } @@ -189,7 +196,7 @@ public class ControlSlot extends ControlSlotBase { if (slot.isReadOnly()) { tooltip.add(I18N.localise(BinnieCore.instance, "gui.slot.pickupOnly")); } - + if (slot.getValidator() == null) { tooltip.add(I18N.localise(BinnieCore.instance, "gui.slot.accepts", I18N.localise(BinnieCore.instance, "gui.slot.anyItem"))); } else { @@ -212,10 +219,4 @@ public class ControlSlot extends ControlSlotBase { ? ((CustomSlot) slot).getInventorySlot() : null; } - - static { - for (EnumHighlighting h : EnumHighlighting.values()) { - ControlSlot.highlighting.put(h, new ArrayList<>()); - } - } } diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotArray.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotArray.java index c1c51aee..9211b4a9 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotArray.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotArray.java @@ -3,22 +3,17 @@ package binnie.core.craftgui.minecraft.control; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.minecraft.InventoryType; -import net.minecraft.item.ItemStack; import java.util.ArrayList; import java.util.Iterator; import java.util.List; public class ControlSlotArray extends Control implements Iterable { - private int rows; - private int columns; private List slots; public ControlSlotArray(IWidget parent, int x, int y, int columns, int rows) { super(parent, x, y, columns * 18, rows * 18); slots = new ArrayList<>(); - this.rows = rows; - this.columns = columns; for (int row = 0; row < rows; ++row) { for (int column = 0; column < columns; ++column) { slots.add(createSlot(column * 18, row * 18)); @@ -30,24 +25,6 @@ public class ControlSlotArray extends Control implements Iterable { return new ControlSlot(this, x, y); } - public void setItemStacks(ItemStack[] array) { - int i = 0; - for (ItemStack item : array) { - if (i >= slots.size()) { - return; - } - slots.get(i).slot.putStack(item); - i++; - } - } - - public ControlSlot getControlSlot(int i) { - if (i < 0 || i >= slots.size()) { - return null; - } - return slots.get(i); - } - public ControlSlotArray create(int[] index) { return create(InventoryType.Machine, index); } diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotBase.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotBase.java index bb9d27ea..01f4ddf8 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotBase.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotBase.java @@ -22,7 +22,7 @@ public abstract class ControlSlotBase extends Control implements ITooltip { public ControlSlotBase(IWidget parent, float x, float y, int size) { super(parent, x, y, size, size); - addAttribute(WidgetAttribute.MouseOver); + addAttribute(WidgetAttribute.MOUSE_OVER); itemDisplay = new ControlItemDisplay(this, 1.0f, 1.0f, size - 2); addSelfEventHandler(new EventWidget.ChangeSize.Handler() { @Override diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotCharge.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotCharge.java index 3d62fcaf..ad6e76fc 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotCharge.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotCharge.java @@ -13,6 +13,11 @@ import binnie.core.machines.inventory.IChargedSlots; public class ControlSlotCharge extends Control { private int slot; + public ControlSlotCharge(IWidget parent, int x, int y, int slot) { + super(parent, x, y, 4.0f, 18.0f); + this.slot = slot; + } + float getCharge() { IChargedSlots slots = Machine.getInterface(IChargedSlots.class, Window.get(this).getInventory()); return (slots == null) ? 0.0f : slots.getCharge(slot); @@ -24,11 +29,6 @@ public class ControlSlotCharge extends Control { CraftGUI.Render.texturePercentage(CraftGUI.Render.getTexture(CraftGUITexture.SlotCharge), getArea().inset(1), Position.BOTTOM, getCharge()); } - public ControlSlotCharge(IWidget parent, int x, int y, int slot) { - super(parent, x, y, 4.0f, 18.0f); - this.slot = slot; - } - @Override public void getHelpTooltip(Tooltip tooltip) { tooltip.add("Charge Remaining: " + (int) (getCharge() * 100.0f) + "%"); diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlUser.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlUser.java index 6fd3ee1f..e38e358b 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlUser.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlUser.java @@ -19,7 +19,7 @@ public class ControlUser extends Control implements ITooltip { super(parent, x, y, 16.0f, 16.0f); this.username = username; team = ""; - addAttribute(WidgetAttribute.MouseOver); + addAttribute(WidgetAttribute.MOUSE_OVER); } @Override @@ -29,7 +29,7 @@ public class ControlUser extends Control implements ITooltip { @Override public void getTooltip(Tooltip tooltip) { - tooltip.setType(Tooltip.Type.User); + tooltip.setType(Tooltip.Type.USER); tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.owner")); if (!username.isEmpty()) { diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/EnumHighlighting.java b/src/main/java/binnie/core/craftgui/minecraft/control/EnumHighlighting.java index ae81a08d..66ca6162 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/EnumHighlighting.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/EnumHighlighting.java @@ -4,24 +4,24 @@ import binnie.core.craftgui.Tooltip; import binnie.core.craftgui.minecraft.MinecraftTooltip; public enum EnumHighlighting { - Error, - Warning, - Help, - ShiftClick; + ERROR, + WARNING, + HELP, + SHIFT_CLICK; int getColour() { switch (this) { - case Error: - return MinecraftTooltip.getOutline(MinecraftTooltip.Type.Error); + case ERROR: + return MinecraftTooltip.getOutline(MinecraftTooltip.Type.ERROR); - case Help: - return MinecraftTooltip.getOutline(Tooltip.Type.Help); + case HELP: + return MinecraftTooltip.getOutline(Tooltip.Type.HELP); - case ShiftClick: + case SHIFT_CLICK: return 0xffff00; - case Warning: - return MinecraftTooltip.getOutline(MinecraftTooltip.Type.Warning); + case WARNING: + return MinecraftTooltip.getOutline(MinecraftTooltip.Type.WARNING); } return 0; } diff --git a/src/main/java/binnie/core/genetics/BreedingSystem.java b/src/main/java/binnie/core/genetics/BreedingSystem.java index b3998a31..da00affe 100644 --- a/src/main/java/binnie/core/genetics/BreedingSystem.java +++ b/src/main/java/binnie/core/genetics/BreedingSystem.java @@ -67,7 +67,6 @@ public abstract class BreedingSystem implements IItemStackRepresentative { } public String getEpitome(float discoveredPercentage) { - // TODO refactor int i = 0; if (discoveredPercentage == 1.0f) { i = 6; @@ -223,6 +222,7 @@ public abstract class BreedingSystem implements IItemStackRepresentative { discovered = true; } } + if (discovered) { branches.add(branch); } @@ -239,6 +239,7 @@ public abstract class BreedingSystem implements IItemStackRepresentative { discovered = true; } } + if (discovered) { branches.add(branch); } diff --git a/src/main/java/binnie/core/genetics/EnumBeeBooleanModifier.java b/src/main/java/binnie/core/genetics/EnumBeeBooleanModifier.java index 2f441b9e..1494ddc1 100644 --- a/src/main/java/binnie/core/genetics/EnumBeeBooleanModifier.java +++ b/src/main/java/binnie/core/genetics/EnumBeeBooleanModifier.java @@ -1,8 +1,8 @@ package binnie.core.genetics; public enum EnumBeeBooleanModifier { - Sealed, - SelfLighted, - SunlightStimulated, - Hellish + SEALED, + SELF_LIGHTED, + SUNLIGHT_STIMULATED, + HELLISH } diff --git a/src/main/java/binnie/core/genetics/EnumBeeModifier.java b/src/main/java/binnie/core/genetics/EnumBeeModifier.java index e1346308..39bd8e1f 100644 --- a/src/main/java/binnie/core/genetics/EnumBeeModifier.java +++ b/src/main/java/binnie/core/genetics/EnumBeeModifier.java @@ -4,12 +4,12 @@ import binnie.core.BinnieCore; import binnie.core.util.I18N; public enum EnumBeeModifier { - Territory, - Mutation, - Lifespan, - Production, - Flowering, - GeneticDecay; + TERRITORY, + MUTATION, + LIFESPAN, + PRODUCTION, + FLOWERING, + GENETIC_DECAY; public String getName() { return I18N.localise(BinnieCore.instance, "beemodifier." + name().toLowerCase()); diff --git a/src/main/java/binnie/core/genetics/ForestryAllele.java b/src/main/java/binnie/core/genetics/ForestryAllele.java index 737c7daf..f91a7f39 100644 --- a/src/main/java/binnie/core/genetics/ForestryAllele.java +++ b/src/main/java/binnie/core/genetics/ForestryAllele.java @@ -45,21 +45,6 @@ public class ForestryAllele { } } - public enum Flowering { - Slowest, - Slower, - Slow, - Average, - Fast, - Faster, - Fastest, - Maximum; - - public IAllele getAllele() { - return AlleleManager.alleleRegistry.getAllele("forestry.flowering" + toString()); - } - } - public enum Territory { Default, Large, diff --git a/src/main/java/binnie/core/genetics/Gene.java b/src/main/java/binnie/core/genetics/Gene.java index 8b768d79..77ddd50a 100644 --- a/src/main/java/binnie/core/genetics/Gene.java +++ b/src/main/java/binnie/core/genetics/Gene.java @@ -96,6 +96,7 @@ public class Gene implements INBTTagable, IGene { if (!(obj instanceof Gene)) { return false; } + Gene g = (Gene) obj; return allele == g.allele && chromosome.ordinal() == g.chromosome.ordinal() && root == g.root; } @@ -104,10 +105,6 @@ public class Gene implements INBTTagable, IGene { return getSystem().getAlleleName(chromosome, allele); } - public String getChromosomeName() { - return getSystem().getChromosomeName(chromosome); - } - public String getShortChromosomeName() { return getSystem().getChromosomeShortName(chromosome); } diff --git a/src/main/java/binnie/core/genetics/IAlleleProvider.java b/src/main/java/binnie/core/genetics/IAlleleProvider.java deleted file mode 100644 index 2db1378b..00000000 --- a/src/main/java/binnie/core/genetics/IAlleleProvider.java +++ /dev/null @@ -1,7 +0,0 @@ -package binnie.core.genetics; - -import forestry.api.genetics.IAllele; - -public interface IAlleleProvider { - IAllele getAllele(); -} diff --git a/src/main/java/binnie/core/genetics/TreeBreedingSystem.java b/src/main/java/binnie/core/genetics/TreeBreedingSystem.java index 7bb38797..30610f00 100644 --- a/src/main/java/binnie/core/genetics/TreeBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/TreeBreedingSystem.java @@ -52,7 +52,6 @@ public class TreeBreedingSystem extends BreedingSystem { public UniqueItemStackSet allWoods = new UniqueItemStackSet(); private UniqueItemStackSet discoveredFruits = new UniqueItemStackSet(); private UniqueItemStackSet discoveredWoods = new UniqueItemStackSet(); - public UniqueItemStackSet discoveredPlanks = new UniqueItemStackSet(); public TreeBreedingSystem() { iconUndiscovered = Binnie.Resource.getItemIcon(ExtraTrees.instance, "icon/undiscoveredTree"); @@ -74,7 +73,7 @@ public class TreeBreedingSystem extends BreedingSystem { @Override public int getColor() { - return 53006; + return 0x00cf0e; } @Override @@ -264,7 +263,10 @@ public class TreeBreedingSystem extends BreedingSystem { @Override public int[] getActiveTypes() { - return new int[]{EnumGermlingType.SAPLING.ordinal(), EnumGermlingType.POLLEN.ordinal()}; + return new int[]{ + EnumGermlingType.SAPLING.ordinal(), + EnumGermlingType.POLLEN.ordinal() + }; } @Override diff --git a/src/main/java/binnie/core/liquid/FluidContainer.java b/src/main/java/binnie/core/liquid/FluidContainer.java index 860600f5..105a4dd2 100644 --- a/src/main/java/binnie/core/liquid/FluidContainer.java +++ b/src/main/java/binnie/core/liquid/FluidContainer.java @@ -62,16 +62,16 @@ public enum FluidContainer { return new ItemStack(Items.bucket, 1, 0); case Can: - return Mods.Forestry.stack("canEmpty"); + return Mods.forestry.stack("canEmpty"); case Capsule: - return Mods.Forestry.stack("waxCapsule"); + return Mods.forestry.stack("waxCapsule"); case Glass: return new ItemStack(Items.glass_bottle, 1, 0); case Refractory: - return Mods.Forestry.stack("refractoryEmpty"); + return Mods.forestry.stack("refractoryEmpty"); case Cylinder: return GeneticsItems.Cylinder.get(1); diff --git a/src/main/java/binnie/core/machines/power/ComponentPowerReceptor.java b/src/main/java/binnie/core/machines/power/ComponentPowerReceptor.java index e583aa91..06d0d46d 100644 --- a/src/main/java/binnie/core/machines/power/ComponentPowerReceptor.java +++ b/src/main/java/binnie/core/machines/power/ComponentPowerReceptor.java @@ -156,7 +156,7 @@ public class ComponentPowerReceptor extends MachineComponent implements if (getMachine().getWorld() == null) { return; } - if (Mods.IC2.active()) { + if (Mods.ic2.active()) { do_addToEnergyNet(); } } @@ -165,7 +165,7 @@ public class ComponentPowerReceptor extends MachineComponent implements if (getMachine().getWorld() == null) { return; } - if (Mods.IC2.active()) { + if (Mods.ic2.active()) { do_removeFromEnergyNet(); } } diff --git a/src/main/java/binnie/core/machines/storage/ControlColourSelector.java b/src/main/java/binnie/core/machines/storage/ControlColourSelector.java index 5199128d..3714a7d6 100644 --- a/src/main/java/binnie/core/machines/storage/ControlColourSelector.java +++ b/src/main/java/binnie/core/machines/storage/ControlColourSelector.java @@ -15,7 +15,7 @@ class ControlColourSelector extends Control implements ITooltip, IControlValue(); - addAttribute(WidgetAttribute.MouseOver); + addAttribute(WidgetAttribute.MOUSE_OVER); } @Override diff --git a/src/main/java/binnie/extrabees/gui/database/ControlClimateBar.java b/src/main/java/binnie/extrabees/gui/database/ControlClimateBar.java index c99b4a71..d15680a8 100644 --- a/src/main/java/binnie/extrabees/gui/database/ControlClimateBar.java +++ b/src/main/java/binnie/extrabees/gui/database/ControlClimateBar.java @@ -30,7 +30,7 @@ public class ControlClimateBar extends Control implements ITooltip { tolerated = new ArrayList<>(); tempColours = new int[]{0x00fffb, 0x78bbff, 0x4fff30, 0xffff00, 0xffa200, 0xff0000}; humidColours = new int[]{0xffe7a3, 0x1aff00, 0x307cff}; - addAttribute(WidgetAttribute.MouseOver); + addAttribute(WidgetAttribute.MOUSE_OVER); } public ControlClimateBar(IWidget parent, int x, int y, int width, int height, boolean humidity) { @@ -38,7 +38,7 @@ public class ControlClimateBar extends Control implements ITooltip { tolerated = new ArrayList<>(); tempColours = new int[]{0x00fffb, 0x78bbff, 0x4fff30, 0xffff00, 0xffa200, 0xff0000}; humidColours = new int[]{0xffe7a3, 0x1aff00, 0x307cff}; - addAttribute(WidgetAttribute.MouseOver); + addAttribute(WidgetAttribute.MOUSE_OVER); isHumidity = true; } diff --git a/src/main/java/binnie/extrabees/gui/database/WindowApiaristDatabase.java b/src/main/java/binnie/extrabees/gui/database/WindowApiaristDatabase.java index 7f25066a..f60be856 100644 --- a/src/main/java/binnie/extrabees/gui/database/WindowApiaristDatabase.java +++ b/src/main/java/binnie/extrabees/gui/database/WindowApiaristDatabase.java @@ -27,16 +27,16 @@ public class WindowApiaristDatabase extends WindowAbstractDatabase { @Override protected void addTabs() { - new PageSpeciesOverview(getInfoPages(Mode.Species), new DatabaseTab(ExtraBees.instance, "species.overview", 0)); - new PageSpeciesClassification(getInfoPages(Mode.Species), new DatabaseTab(ExtraBees.instance, "species.classification", 0)); - new PageSpeciesGenome(getInfoPages(Mode.Species), new DatabaseTab(ExtraBees.instance, "species.genome", 0)); - new PageSpeciesProducts(getInfoPages(Mode.Species), new DatabaseTab(ExtraBees.instance, "species.products", 0)); - new PageSpeciesClimate(getInfoPages(Mode.Species), new DatabaseTab(ExtraBees.instance, "species.climate", 0)); - new PageSpeciesResultant(getInfoPages(Mode.Species), new DatabaseTab(ExtraBees.instance, "species.resultant", 0)); - new PageSpeciesMutations(getInfoPages(Mode.Species), new DatabaseTab(ExtraBees.instance, "species.further", 0)); - new PageBranchOverview(getInfoPages(Mode.Branches), new DatabaseTab(ExtraBees.instance, "branches.overview", 0)); - new PageBranchSpecies(getInfoPages(Mode.Branches), new DatabaseTab(ExtraBees.instance, "branches.species", 0)); - new PageBreeder(getInfoPages(Mode.Breeder), getUsername(), new DatabaseTab(ExtraBees.instance, "breeder", 0)); + new PageSpeciesOverview(getInfoPages(Mode.Species), new DatabaseTab(ExtraBees.instance, "species.overview")); + new PageSpeciesClassification(getInfoPages(Mode.Species), new DatabaseTab(ExtraBees.instance, "species.classification")); + new PageSpeciesGenome(getInfoPages(Mode.Species), new DatabaseTab(ExtraBees.instance, "species.genome")); + new PageSpeciesProducts(getInfoPages(Mode.Species), new DatabaseTab(ExtraBees.instance, "species.products")); + new PageSpeciesClimate(getInfoPages(Mode.Species), new DatabaseTab(ExtraBees.instance, "species.climate")); + new PageSpeciesResultant(getInfoPages(Mode.Species), new DatabaseTab(ExtraBees.instance, "species.resultant")); + new PageSpeciesMutations(getInfoPages(Mode.Species), new DatabaseTab(ExtraBees.instance, "species.further")); + new PageBranchOverview(getInfoPages(Mode.Branches), new DatabaseTab(ExtraBees.instance, "branches.overview")); + new PageBranchSpecies(getInfoPages(Mode.Branches), new DatabaseTab(ExtraBees.instance, "branches.species")); + new PageBreeder(getInfoPages(Mode.Breeder), getUsername(), new DatabaseTab(ExtraBees.instance, "breeder")); } @Override diff --git a/src/main/java/binnie/extrabees/products/ItemHoneyComb.java b/src/main/java/binnie/extrabees/products/ItemHoneyComb.java index 89306768..d91e4e23 100644 --- a/src/main/java/binnie/extrabees/products/ItemHoneyComb.java +++ b/src/main/java/binnie/extrabees/products/ItemHoneyComb.java @@ -25,8 +25,8 @@ public class ItemHoneyComb extends ItemProduct { } public static void addSubtypes() { - ItemStack beeswax = Mods.Forestry.stack("beeswax"); - ItemStack honeyDrop = Mods.Forestry.stack("honeyDrop"); + ItemStack beeswax = Mods.forestry.stack("beeswax"); + ItemStack honeyDrop = Mods.forestry.stack("honeyDrop"); OreDictionary.registerOre("ingotIron", Items.iron_ingot); OreDictionary.registerOre("ingotGold", Items.gold_ingot); OreDictionary.registerOre("gemDiamond", Items.diamond); @@ -88,8 +88,8 @@ public class ItemHoneyComb extends ItemProduct { EnumHoneyComb.REDSTONE.addProduct(honeyDrop, 0.50f); EnumHoneyComb.RESIN.addProduct(beeswax, 1.00f); - EnumHoneyComb.RESIN.tryAddProduct(Mods.IC2.stack("itemHarz"), 1.00f); - EnumHoneyComb.RESIN.tryAddProduct(Mods.IC2.stack("itemHarz"), 0.50f); + EnumHoneyComb.RESIN.tryAddProduct(Mods.ic2.stack("itemHarz"), 1.00f); + EnumHoneyComb.RESIN.tryAddProduct(Mods.ic2.stack("itemHarz"), 0.50f); EnumHoneyComb.IC2ENERGY.addProduct(beeswax, 0.80f); EnumHoneyComb.IC2ENERGY.addProduct(new ItemStack(Items.redstone, 1, 0), 0.75f); @@ -147,7 +147,7 @@ public class ItemHoneyComb extends ItemProduct { EnumHoneyComb.COFFEE.addProduct(beeswax, 0.90f); EnumHoneyComb.COFFEE.addProduct(honeyDrop, 0.75f); - EnumHoneyComb.COFFEE.tryAddProduct(Mods.IC2.stack("itemCofeePowder"), 0.75f); + EnumHoneyComb.COFFEE.tryAddProduct(Mods.ic2.stack("itemCofeePowder"), 0.75f); EnumHoneyComb.GLACIAL.tryAddProduct(EnumHoneyDrop.ICE, 0.80f); EnumHoneyComb.GLACIAL.addProduct(honeyDrop, 0.75f); @@ -199,7 +199,7 @@ public class ItemHoneyComb extends ItemProduct { EnumHoneyComb.SALTPETER.tryAddProduct(getOreDictionary("dustSaltpeter"), 1.00f); EnumHoneyComb.COMPOST.addProduct(honeyDrop, 0.25f); - EnumHoneyComb.COMPOST.tryAddProduct(Mods.Forestry.stack("fertilizerBio"), 1.00f); + EnumHoneyComb.COMPOST.tryAddProduct(Mods.forestry.stack("fertilizerBio"), 1.00f); EnumHoneyComb.SAWDUST.addProduct(honeyDrop, 0.25f); if (!OreDictionary.getOres("dustSawdust").isEmpty()) { @@ -338,7 +338,7 @@ public class ItemHoneyComb extends ItemProduct { QUARTZ; public ItemStack get() { - return new ItemStack(Mods.Forestry.item("beeCombs"), 1, ordinal()); + return new ItemStack(Mods.forestry.item("beeCombs"), 1, ordinal()); } } } diff --git a/src/main/java/binnie/extrabees/products/ModuleProducts.java b/src/main/java/binnie/extrabees/products/ModuleProducts.java index ca0b5bc8..d4e00d63 100644 --- a/src/main/java/binnie/extrabees/products/ModuleProducts.java +++ b/src/main/java/binnie/extrabees/products/ModuleProducts.java @@ -31,7 +31,7 @@ public class ModuleProducts implements IInitializable { GameRegistry.addRecipe( new ItemStack(ExtraBees.honeyCrystalEmpty), "#@#", "@#@", "#@#", - '@', Mods.Forestry.stack("honeyDrop"), + '@', Mods.forestry.stack("honeyDrop"), '#', EnumHoneyDrop.ENERGY.get(1) ); for (EnumHoneyComb info : EnumHoneyComb.values()) { diff --git a/src/main/java/binnie/extratrees/block/ModuleBlocks.java b/src/main/java/binnie/extratrees/block/ModuleBlocks.java index 4d10ce07..0d6df75a 100644 --- a/src/main/java/binnie/extratrees/block/ModuleBlocks.java +++ b/src/main/java/binnie/extratrees/block/ModuleBlocks.java @@ -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) { diff --git a/src/main/java/binnie/extratrees/block/PlankType.java b/src/main/java/binnie/extratrees/block/PlankType.java index 66f45634..1a8c4ecc 100644 --- a/src/main/java/binnie/extratrees/block/PlankType.java +++ b/src/main/java/binnie/extratrees/block/PlankType.java @@ -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; } diff --git a/src/main/java/binnie/extratrees/block/decor/BlockFence.java b/src/main/java/binnie/extratrees/block/decor/BlockFence.java index 66fad999..e957e8cd 100644 --- a/src/main/java/binnie/extratrees/block/decor/BlockFence.java +++ b/src/main/java/binnie/extratrees/block/decor/BlockFence.java @@ -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 diff --git a/src/main/java/binnie/extratrees/config/ConfigurationMain.java b/src/main/java/binnie/extratrees/config/ConfigurationMain.java index 44c77e37..5193dd59 100644 --- a/src/main/java/binnie/extratrees/config/ConfigurationMain.java +++ b/src/main/java/binnie/extratrees/config/ConfigurationMain.java @@ -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; diff --git a/src/main/java/binnie/extratrees/craftgui/dictionary/ControlBreweryProgress.java b/src/main/java/binnie/extratrees/craftgui/dictionary/ControlBreweryProgress.java index acb3dd20..6e3643ac 100644 --- a/src/main/java/binnie/extratrees/craftgui/dictionary/ControlBreweryProgress.java +++ b/src/main/java/binnie/extratrees/craftgui/dictionary/ControlBreweryProgress.java @@ -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 diff --git a/src/main/java/binnie/extratrees/craftgui/dictionary/ControlFruitPressProgress.java b/src/main/java/binnie/extratrees/craftgui/dictionary/ControlFruitPressProgress.java index d99e67bd..5a9fc85e 100644 --- a/src/main/java/binnie/extratrees/craftgui/dictionary/ControlFruitPressProgress.java +++ b/src/main/java/binnie/extratrees/craftgui/dictionary/ControlFruitPressProgress.java @@ -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) { diff --git a/src/main/java/binnie/extratrees/craftgui/dictionary/ControlTileSelect.java b/src/main/java/binnie/extratrees/craftgui/dictionary/ControlTileSelect.java index 11b385d9..b9dcbcab 100644 --- a/src/main/java/binnie/extratrees/craftgui/dictionary/ControlTileSelect.java +++ b/src/main/java/binnie/extratrees/craftgui/dictionary/ControlTileSelect.java @@ -126,7 +126,7 @@ public class ControlTileSelect extends Control implements IControlValue 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) { diff --git a/src/main/java/binnie/extratrees/craftgui/dictionary/PageSpeciesImage.java b/src/main/java/binnie/extratrees/craftgui/dictionary/PageSpeciesImage.java index 559ec43a..8aca2545 100644 --- a/src/main/java/binnie/extratrees/craftgui/dictionary/PageSpeciesImage.java +++ b/src/main/java/binnie/extratrees/craftgui/dictionary/PageSpeciesImage.java @@ -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); } } diff --git a/src/main/java/binnie/extratrees/craftgui/dictionary/WindowArboristDatabase.java b/src/main/java/binnie/extratrees/craftgui/dictionary/WindowArboristDatabase.java index 19fdceab..fbc107a4 100644 --- a/src/main/java/binnie/extratrees/craftgui/dictionary/WindowArboristDatabase.java +++ b/src/main/java/binnie/extratrees/craftgui/dictionary/WindowArboristDatabase.java @@ -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(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(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(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() { diff --git a/src/main/java/binnie/extratrees/craftgui/dictionary/WindowLepidopteristDatabase.java b/src/main/java/binnie/extratrees/craftgui/dictionary/WindowLepidopteristDatabase.java index b370cba1..e9bcd316 100644 --- a/src/main/java/binnie/extratrees/craftgui/dictionary/WindowLepidopteristDatabase.java +++ b/src/main/java/binnie/extratrees/craftgui/dictionary/WindowLepidopteristDatabase.java @@ -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 diff --git a/src/main/java/binnie/extratrees/craftgui/kitchen/ControlDropDownMenu.java b/src/main/java/binnie/extratrees/craftgui/kitchen/ControlDropDownMenu.java index db3692cb..ddac73e3 100644 --- a/src/main/java/binnie/extratrees/craftgui/kitchen/ControlDropDownMenu.java +++ b/src/main/java/binnie/extratrees/craftgui/kitchen/ControlDropDownMenu.java @@ -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); } } diff --git a/src/main/java/binnie/extratrees/craftgui/kitchen/ControlFluidDisplay.java b/src/main/java/binnie/extratrees/craftgui/kitchen/ControlFluidDisplay.java index 0a35a022..8f2a5d93 100644 --- a/src/main/java/binnie/extratrees/craftgui/kitchen/ControlFluidDisplay.java +++ b/src/main/java/binnie/extratrees/craftgui/kitchen/ControlFluidDisplay.java @@ -38,7 +38,7 @@ public class ControlFluidDisplay extends Control implements ITooltip { public void setTooltip() { hastooltip = true; - addAttribute(WidgetAttribute.MouseOver); + addAttribute(WidgetAttribute.MOUSE_OVER); } @Override diff --git a/src/main/java/binnie/extratrees/craftgui/kitchen/ControlSlotFluid.java b/src/main/java/binnie/extratrees/craftgui/kitchen/ControlSlotFluid.java index 1ab76319..1bb50fa7 100644 --- a/src/main/java/binnie/extratrees/craftgui/kitchen/ControlSlotFluid.java +++ b/src/main/java/binnie/extratrees/craftgui/kitchen/ControlSlotFluid.java @@ -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() { diff --git a/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java b/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java index c1195773..4834d9d8 100644 --- a/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java +++ b/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java @@ -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)) { diff --git a/src/main/java/binnie/extratrees/genetics/ExtraTreeSpecies.java b/src/main/java/binnie/extratrees/genetics/ExtraTreeSpecies.java index 0746796a..a75d23ed 100644 --- a/src/main/java/binnie/extratrees/genetics/ExtraTreeSpecies.java +++ b/src/main/java/binnie/extratrees/genetics/ExtraTreeSpecies.java @@ -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)) { diff --git a/src/main/java/binnie/extratrees/item/Food.java b/src/main/java/binnie/extratrees/item/Food.java index 69acfde7..b7b18941 100644 --- a/src/main/java/binnie/extratrees/item/Food.java +++ b/src/main/java/binnie/extratrees/item/Food.java @@ -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 ); } diff --git a/src/main/java/binnie/extratrees/item/ModuleItems.java b/src/main/java/binnie/extratrees/item/ModuleItems.java index 419da4b5..e63a7b2b 100644 --- a/src/main/java/binnie/extratrees/item/ModuleItems.java +++ b/src/main/java/binnie/extratrees/item/ModuleItems.java @@ -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()); } } diff --git a/src/main/java/binnie/extratrees/machines/ModuleMachine.java b/src/main/java/binnie/extratrees/machines/ModuleMachine.java index 5b600461..7efb6660 100644 --- a/src/main/java/binnie/extratrees/machines/ModuleMachine.java +++ b/src/main/java/binnie/extratrees/machines/ModuleMachine.java @@ -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") )); } } diff --git a/src/main/java/binnie/extratrees/worldgen/BlockTypeLeaf.java b/src/main/java/binnie/extratrees/worldgen/BlockTypeLeaf.java index 7212571a..6edf1ec6 100644 --- a/src/main/java/binnie/extratrees/worldgen/BlockTypeLeaf.java +++ b/src/main/java/binnie/extratrees/worldgen/BlockTypeLeaf.java @@ -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 diff --git a/src/main/java/binnie/genetics/craftgui/ControlGene.java b/src/main/java/binnie/genetics/craftgui/ControlGene.java index b7cfe80b..c4cf3578 100644 --- a/src/main/java/binnie/genetics/craftgui/ControlGene.java +++ b/src/main/java/binnie/genetics/craftgui/ControlGene.java @@ -22,7 +22,7 @@ public class ControlGene extends Control implements IControlValue, IToolt protected ControlGene(IWidget parent, float x, float y) { super(parent, x, y, 16.0f, 16.0f); - addAttribute(WidgetAttribute.MouseOver); + addAttribute(WidgetAttribute.MOUSE_OVER); addSelfEventHandler(new EventMouse.Down.Handler() { @Override public void onEvent(EventMouse.Down event) { diff --git a/src/main/java/binnie/genetics/gui/AnalystPageMutations.java b/src/main/java/binnie/genetics/gui/AnalystPageMutations.java index bbc724e8..f72141a9 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageMutations.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageMutations.java @@ -54,25 +54,25 @@ public class AnalystPageMutations extends ControlAnalystPage { hive = new ItemStack(ExtraBees.hive, 1, 2); } if (ind.getGenome().getPrimary() == BeeDefinition.FOREST.getGenome().getPrimary()) { - hive = new ItemStack(Mods.Forestry.block("beehives"), 1, 1); + hive = new ItemStack(Mods.forestry.block("beehives"), 1, 1); } if (ind.getGenome().getPrimary() == BeeDefinition.MEADOWS.getGenome().getPrimary()) { - hive = new ItemStack(Mods.Forestry.block("beehives"), 1, 2); + hive = new ItemStack(Mods.forestry.block("beehives"), 1, 2); } if (ind.getGenome().getPrimary() == BeeDefinition.MODEST.getGenome().getPrimary()) { - hive = new ItemStack(Mods.Forestry.block("beehives"), 1, 3); + hive = new ItemStack(Mods.forestry.block("beehives"), 1, 3); } if (ind.getGenome().getPrimary() == BeeDefinition.TROPICAL.getGenome().getPrimary()) { - hive = new ItemStack(Mods.Forestry.block("beehives"), 1, 4); + hive = new ItemStack(Mods.forestry.block("beehives"), 1, 4); } if (ind.getGenome().getPrimary() == BeeDefinition.ENDED.getGenome().getPrimary()) { - hive = new ItemStack(Mods.Forestry.block("beehives"), 1, 5); + hive = new ItemStack(Mods.forestry.block("beehives"), 1, 5); } if (ind.getGenome().getPrimary() == BeeDefinition.WINTRY.getGenome().getPrimary()) { - hive = new ItemStack(Mods.Forestry.block("beehives"), 1, 6); + hive = new ItemStack(Mods.forestry.block("beehives"), 1, 6); } if (ind.getGenome().getPrimary() == BeeDefinition.MARSHY.getGenome().getPrimary()) { - hive = new ItemStack(Mods.Forestry.block("beehives"), 1, 7); + hive = new ItemStack(Mods.forestry.block("beehives"), 1, 7); } if (ind.getGenome().getPrimary() == BeeDefinition.STEADFAST.getGenome().getPrimary()) { hive = new ItemStack(Blocks.chest); @@ -253,7 +253,7 @@ public class AnalystPageMutations extends ControlAnalystPage { static class ControlUnknownMutation extends Control { public ControlUnknownMutation(IWidget parent, float x, float y, float w, float h) { super(parent, x, y, w, h); - addAttribute(WidgetAttribute.MouseOver); + addAttribute(WidgetAttribute.MOUSE_OVER); addTooltip("Unknown Mutation"); } diff --git a/src/main/java/binnie/genetics/gui/ControlAnalystChromosome.java b/src/main/java/binnie/genetics/gui/ControlAnalystChromosome.java index 64d1df04..3089c021 100644 --- a/src/main/java/binnie/genetics/gui/ControlAnalystChromosome.java +++ b/src/main/java/binnie/genetics/gui/ControlAnalystChromosome.java @@ -28,7 +28,7 @@ public class ControlAnalystChromosome extends Control implements ITooltip { super(parent, x, y, 16.0f, 22.0f); Homozygous = new StandardTexture(0, 0, 16, 22, BinnieCoreTexture.GUIAnalyst); Heterozygous = new StandardTexture(16, 0, 16, 22, BinnieCoreTexture.GUIAnalyst); - addAttribute(WidgetAttribute.MouseOver); + addAttribute(WidgetAttribute.MOUSE_OVER); this.root = root; chromosomeType = type; this.allele0 = allele0; diff --git a/src/main/java/binnie/genetics/gui/ControlChromoPicker.java b/src/main/java/binnie/genetics/gui/ControlChromoPicker.java index 24394d80..132f1364 100644 --- a/src/main/java/binnie/genetics/gui/ControlChromoPicker.java +++ b/src/main/java/binnie/genetics/gui/ControlChromoPicker.java @@ -25,7 +25,7 @@ public class ControlChromoPicker extends Control implements ITooltip { Selected = new StandardTexture(160, 18, 16, 16, ExtraBeeTexture.GUIPunnett); Texture = new StandardTexture(160, 34, 16, 16, ExtraBeeTexture.GUIPunnett); type = chromo; - addAttribute(WidgetAttribute.MouseOver); + addAttribute(WidgetAttribute.MOUSE_OVER); this.parent = parent; addSelfEventHandler(new EventWidget.StartMouseOver.Handler() { @Override diff --git a/src/main/java/binnie/genetics/gui/ControlToleranceBar.java b/src/main/java/binnie/genetics/gui/ControlToleranceBar.java index b2d21897..5b14cbcd 100644 --- a/src/main/java/binnie/genetics/gui/ControlToleranceBar.java +++ b/src/main/java/binnie/genetics/gui/ControlToleranceBar.java @@ -22,7 +22,7 @@ public abstract class ControlToleranceBar> extends Control imp public ControlToleranceBar(IWidget parent, float x, float y, float width, float height, Class clss) { super(parent, x, y, width, height); - addAttribute(WidgetAttribute.MouseOver); + addAttribute(WidgetAttribute.MOUSE_OVER); enumClass = clss; tolerated = EnumSet.noneOf(enumClass); fullSet = EnumSet.allOf(enumClass); diff --git a/src/main/java/binnie/genetics/gui/WindowAnalyst.java b/src/main/java/binnie/genetics/gui/WindowAnalyst.java index e23a2800..e6509bac 100644 --- a/src/main/java/binnie/genetics/gui/WindowAnalyst.java +++ b/src/main/java/binnie/genetics/gui/WindowAnalyst.java @@ -126,7 +126,7 @@ public class WindowAnalyst extends Window { new Control(this, x, y, 20.0f, 20.0f) { @Override public void initialise() { - addAttribute(WidgetAttribute.MouseOver); + addAttribute(WidgetAttribute.MOUSE_OVER); addSelfEventHandler(new EventMouse.Down.Handler() { @Override public void onEvent(EventMouse.Down event) { @@ -313,7 +313,7 @@ public class WindowAnalyst extends Window { @Override protected void initialise() { super.initialise(); - addAttribute(WidgetAttribute.MouseOver); + addAttribute(WidgetAttribute.MOUSE_OVER); value = page; addSelfEventHandler(new EventMouse.Down.Handler() { @Override diff --git a/src/main/java/binnie/genetics/item/ModuleItem.java b/src/main/java/binnie/genetics/item/ModuleItem.java index c884cd1e..d104ed4b 100644 --- a/src/main/java/binnie/genetics/item/ModuleItem.java +++ b/src/main/java/binnie/genetics/item/ModuleItem.java @@ -82,7 +82,7 @@ public class ModuleItem implements IInitializable { new Object[]{ "iii", "iYi", "iii", 'i', "ingotIron", - 'Y', Mods.Forestry.item("sturdyMachine") + 'Y', Mods.forestry.item("sturdyMachine") } )); @@ -151,7 +151,7 @@ public class ModuleItem implements IInitializable { GeneticsItems.IntegratedCircuit.get(1), new Object[]{ "l g", " c ", "g l", - 'c', Mods.Forestry.stack("chipsets", 1, 1), + 'c', Mods.forestry.stack("chipsets", 1, 1), 'l', new ItemStack(Items.dye, 1, 4), 'g', "dustGlowstone" } @@ -161,7 +161,7 @@ public class ModuleItem implements IInitializable { GeneticsItems.IntegratedCircuit.get(1), new Object[]{ "g l", " c ", "l g", - 'c', Mods.Forestry.stack("chipsets", 1, 1), + 'c', Mods.forestry.stack("chipsets", 1, 1), 'l', new ItemStack(Items.dye, 1, 4), 'g', "dustGlowstone" } @@ -205,9 +205,9 @@ public class ModuleItem implements IInitializable { // TODO refactor refactor refactor this! Item[] arr$; Item[] lyzers = arr$ = new Item[]{ - Mods.Forestry.item("beealyzer"), - Mods.Forestry.item("treealyzer"), - Mods.Forestry.item("flutterlyzer") + Mods.forestry.item("beealyzer"), + Mods.forestry.item("treealyzer"), + Mods.forestry.item("flutterlyzer") }; for (Item a : arr$) { for (Item b : lyzers) { diff --git a/src/main/java/binnie/genetics/machine/ModuleMachine.java b/src/main/java/binnie/genetics/machine/ModuleMachine.java index 434f36ea..80441a0a 100644 --- a/src/main/java/binnie/genetics/machine/ModuleMachine.java +++ b/src/main/java/binnie/genetics/machine/ModuleMachine.java @@ -51,7 +51,7 @@ public class ModuleMachine implements IInitializable { @Override public void postInit() { Acclimatiser.setupRecipes(); - Object[] standardCircuit = {Mods.Forestry.stack("chipsets", 1, 1)}; + Object[] standardCircuit = {Mods.forestry.stack("chipsets", 1, 1)}; Object[] advCircuit = {GeneticsItems.IntegratedCircuit.get(1)}; String ironGear = OreDictionary.getOres("gearIron").isEmpty() ? "gearIron" : "ingotIron"; String goldGear = OreDictionary.getOres("gearGold").isEmpty() ? "gearIron" : "ingotIron"; @@ -73,11 +73,11 @@ public class ModuleMachine implements IInitializable { Item alyzer = null; if (BinnieCore.isApicultureActive()) { - alyzer = Mods.Forestry.item("beealyzer"); + alyzer = Mods.forestry.item("beealyzer"); } else if (BinnieCore.isArboricultureActive()) { - alyzer = Mods.Forestry.item("treealyzer"); + alyzer = Mods.forestry.item("treealyzer"); } else if (BinnieCore.isArboricultureActive()) { - alyzer = Mods.Forestry.item("flutterlyzer"); + alyzer = Mods.forestry.item("flutterlyzer"); } if (alyzer != null) { diff --git a/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java b/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java index 0cbc799c..8978f349 100644 --- a/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java +++ b/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java @@ -106,11 +106,11 @@ public class Acclimatiser { addTemperatureItem(new ItemStack(Blocks.ice), -0.75f); addHumidityItem(new ItemStack(Items.water_bucket), 0.75f); addHumidityItem(new ItemStack(Blocks.sand), -0.15f); - addTemperatureItem(Mods.Forestry.stack("canLava"), 0.75f); - addTemperatureItem(Mods.Forestry.stack("refractoryLava"), 0.75f); - addHumidityItem(Mods.Forestry.stack("canWater"), 0.75f); - addHumidityItem(Mods.Forestry.stack("refractoryWater"), 0.75f); - addHumidityItem(Mods.Forestry.stack("waxCapsuleWater"), 0.75f); + addTemperatureItem(Mods.forestry.stack("canLava"), 0.75f); + addTemperatureItem(Mods.forestry.stack("refractoryLava"), 0.75f); + addHumidityItem(Mods.forestry.stack("canWater"), 0.75f); + addHumidityItem(Mods.forestry.stack("refractoryWater"), 0.75f); + addHumidityItem(Mods.forestry.stack("waxCapsuleWater"), 0.75f); } public static boolean canAcclimatise(ItemStack stack, List acclimatisers) { diff --git a/src/main/resources/assets/binniecore/lang/en_GB.lang b/src/main/resources/assets/binniecore/lang/en_GB.lang index 45887436..eaa58d1a 100644 --- a/src/main/resources/assets/binniecore/lang/en_GB.lang +++ b/src/main/resources/assets/binniecore/lang/en_GB.lang @@ -1,292 +1,10 @@ -binniecore.mod.name=Binnie Core - -binniecore.rootBees.descriptor=Apiarist -binniecore.rootTrees.descriptor=Arborist -binniecore.rootButterflies.descriptor=Lepidopterist -binniecore.rootFlowers.descriptor=Botanist - -binniecore.rootBees.shortName=Bees -binniecore.rootTrees.shortName=Trees -binniecore.rootButterflies.shortName=Butterflies & Moths -binniecore.rootFlowers.shortName=Flowers - -binniecore.rootBees.epitome.0=Bee Swatter -binniecore.rootBees.epitome.1=Amateur Beekeeper -binniecore.rootBees.epitome.2=Apiarist-In-Training -binniecore.rootBees.epitome.3=Professional Beekeeper -binniecore.rootBees.epitome.4=Master Apiarist binniecore.rootBees.epitome.5=God amongst Apiarists -binniecore.rootBees.epitome.6=Sengir's Chosen - -binniecore.rootTrees.epitome.0=Wannabe Tree Farmer -binniecore.rootTrees.epitome.1=Lumberjack -binniecore.rootTrees.epitome.2=Green Thumbed -binniecore.rootTrees.epitome.3=Renowned Farmer -binniecore.rootTrees.epitome.4=Agricultural Master -binniecore.rootTrees.epitome.5=Lord of the Trees -binniecore.rootTrees.epitome.6=Mother Nature - -binniecore.rootButterflies.epitome.0=Bug Catcher -binniecore.rootButterflies.epitome.1=Moth Chaser -binniecore.rootButterflies.epitome.2=Scoop Wizard binniecore.rootButterflies.epitome.3=Caterpillar Lord -binniecore.rootButterflies.epitome.4=Winged Assassin -binniecore.rootButterflies.epitome.5=Moth King -binniecore.rootButterflies.epitome.6=Monarch of the Butterflies - -binniecore.rootFlowers.epitome.0=Pansy -binniecore.rootFlowers.epitome.1=Daisy Pusher -binniecore.rootFlowers.epitome.2=Flower Power -binniecore.rootFlowers.epitome.3=Midas Touch -binniecore.rootFlowers.epitome.4=Green Thumb binniecore.rootFlowers.epitome.5=Master Gardener -binniecore.rootFlowers.epitome.6=Peerless Botanist -binniecore.rootBees.chromosome.species=Species -binniecore.rootBees.chromosome.speed=Production -binniecore.rootBees.chromosome.lifespan=Lifespan -binniecore.rootBees.chromosome.fertility=Fertility -binniecore.rootBees.chromosome.temperature_tolerance=Temperature Tolerance -binniecore.rootBees.chromosome.nocturnal=Cathemeral -binniecore.rootBees.chromosome.humidity=Humidity -binniecore.rootBees.chromosome.humidity_tolerance=Humidity Tolerance -binniecore.rootBees.chromosome.tolerant_flyer=Rain Tolerance -binniecore.rootBees.chromosome.cave_dwelling=Cave Dwelling -binniecore.rootBees.chromosome.flower_provider=Flowers -binniecore.rootBees.chromosome.flowering=Pollination -binniecore.rootBees.chromosome.territory=Territory -binniecore.rootBees.chromosome.effect=Effect - -binniecore.rootBees.chromosome.species.short=Species -binniecore.rootBees.chromosome.speed.short=Production -binniecore.rootBees.chromosome.lifespan.short=Lifespan -binniecore.rootBees.chromosome.fertility.short=Fertility -binniecore.rootBees.chromosome.temperature_tolerance.short=Temp. Tol. -binniecore.rootBees.chromosome.nocturnal.short=Cathemeral -binniecore.rootBees.chromosome.humidity.short=Humidity -binniecore.rootBees.chromosome.humidity_tolerance.short=Humid. Tol. -binniecore.rootBees.chromosome.tolerant_flyer.short=Rain Tol. -binniecore.rootBees.chromosome.cave_dwelling.short=Cave Dwell. -binniecore.rootBees.chromosome.flower_provider.short=Flowers -binniecore.rootBees.chromosome.flowering.short=Pollination -binniecore.rootBees.chromosome.territory.short=Territory -binniecore.rootBees.chromosome.effect.short=Effect - -binniecore.rootTrees.chromosome.species=Species -binniecore.rootTrees.chromosome.growth=Growth -binniecore.rootTrees.chromosome.height=Height -binniecore.rootTrees.chromosome.fertility=Fertility -binniecore.rootTrees.chromosome.fruits=Fruit -binniecore.rootTrees.chromosome.yield=Yield -binniecore.rootTrees.chromosome.plant=Plant Type -binniecore.rootTrees.chromosome.sappiness=Sappiness -binniecore.rootTrees.chromosome.territory=Territory -binniecore.rootTrees.chromosome.effect=Effect -binniecore.rootTrees.chromosome.maturation=Maturation -binniecore.rootTrees.chromosome.girth=Girth -binniecore.rootTrees.chromosome.fireproof=Fireproof - -binniecore.rootTrees.chromosome.species.short=Species -binniecore.rootTrees.chromosome.growth.short=Growth -binniecore.rootTrees.chromosome.height.short=Height -binniecore.rootTrees.chromosome.fertility.short=Fertility -binniecore.rootTrees.chromosome.fruits.short=Fruit -binniecore.rootTrees.chromosome.yield.short=Yield -binniecore.rootTrees.chromosome.plant.short=Plant Type -binniecore.rootTrees.chromosome.sappiness.short=Sappiness -binniecore.rootTrees.chromosome.territory.short=Territory -binniecore.rootTrees.chromosome.effect.short=Effect -binniecore.rootTrees.chromosome.maturation.short=Maturation -binniecore.rootTrees.chromosome.girth.short=Girth -binniecore.rootTrees.chromosome.fireproof.short=Fireproof - -binniecore.rootButterflies.chromosome.species=Species -binniecore.rootButterflies.chromosome.size=Size -binniecore.rootButterflies.chromosome.speed=Speed -binniecore.rootButterflies.chromosome.lifespan=Lifespan -binniecore.rootButterflies.chromosome.metabolism=Metabolism -binniecore.rootButterflies.chromosome.fertility=Fertility -binniecore.rootButterflies.chromosome.temperature_tolerance=Temperature Tolerance -binniecore.rootButterflies.chromosome.humidity_tolerance=Humidity Tolerance -binniecore.rootButterflies.chromosome.nocturnal=Cathemeral -binniecore.rootButterflies.chromosome.tolerant_flyer=Rain Tolerance -binniecore.rootButterflies.chromosome.fire_resist=Fire Resistance -binniecore.rootButterflies.chromosome.flower_provider=Flowers -binniecore.rootButterflies.chromosome.effect=Effect -binniecore.rootButterflies.chromosome.territory=Territory - -binniecore.rootButterflies.chromosome.species.short=Species -binniecore.rootButterflies.chromosome.size.short=Size -binniecore.rootButterflies.chromosome.speed.short=Speed -binniecore.rootButterflies.chromosome.lifespan.short=Lifespan -binniecore.rootButterflies.chromosome.metabolism.short=Metabolism -binniecore.rootButterflies.chromosome.fertility.short=Fertility -binniecore.rootButterflies.chromosome.temperature_tolerance.short=Temp. Tol. -binniecore.rootButterflies.chromosome.humidity_tolerance.short=Humid. Tol. -binniecore.rootButterflies.chromosome.nocturnal.short=Cathemeral -binniecore.rootButterflies.chromosome.tolerant_flyer.short=Rain Tol. -binniecore.rootButterflies.chromosome.fire_resist.short=Fire Resist. -binniecore.rootButterflies.chromosome.flower_provider.short=Flowers -binniecore.rootButterflies.chromosome.effect.short=Effect -binniecore.rootButterflies.chromosome.territory.short=Territory - -binniecore.rootFlowers.chromosome.species=Species -binniecore.rootFlowers.chromosome.primary=Primary Colour -binniecore.rootFlowers.chromosome.secondary=Secondary Colour -binniecore.rootFlowers.chromosome.fertility=Fertility -binniecore.rootFlowers.chromosome.territory=Territory -binniecore.rootFlowers.chromosome.effect=Effect -binniecore.rootFlowers.chromosome.lifespan=Lifespan -binniecore.rootFlowers.chromosome.temperature_tolerance=Temperature Tolerance -binniecore.rootFlowers.chromosome.humidity_tolerance=Humidity Tolerance -binniecore.rootFlowers.chromosome.ph_tolerance=pH Tolerance -binniecore.rootFlowers.chromosome.sappiness=Nectar -binniecore.rootFlowers.chromosome.stem=Stem Colour - -binniecore.rootFlowers.chromosome.species.short=Species -binniecore.rootFlowers.chromosome.primary.short=Prim. Colour -binniecore.rootFlowers.chromosome.secondary.short=Sec. Colour -binniecore.rootFlowers.chromosome.fertility.short=Fertility -binniecore.rootFlowers.chromosome.territory.short=Territory -binniecore.rootFlowers.chromosome.effect.short=Effect -binniecore.rootFlowers.chromosome.lifespan.short=Lifespan -binniecore.rootFlowers.chromosome.temperature_tolerance.short=Temp. Tol. -binniecore.rootFlowers.chromosome.humidity_tolerance.short=Humid. Tol. -binniecore.rootFlowers.chromosome.ph_tolerance.short=pH Tol. -binniecore.rootFlowers.chromosome.sappiness.short=Nectar -binniecore.rootFlowers.chromosome.stem.short=Stem Colour - -binniecore.allele.fertility.low=Low -binniecore.allele.fertility.normal=Normal -binniecore.allele.fertility.high=High -binniecore.allele.fertility.maximum=Maximum - -binniecore.allele.true=Yes -binniecore.allele.false=No -binniecore.allele.none=None - -binniecore.allele.metabolism.highest=Highest -binniecore.allele.metabolism.higher=Higher -binniecore.allele.metabolism.high=High -binniecore.allele.metabolism.average=Average -binniecore.allele.metabolism.slow=Slow -binniecore.allele.metabolism.slower=Slower -binniecore.allele.metabolism.slowest=Slowest - -binniecore.allele.growth.tropical=Tropical -binniecore.allele.growth.lightlevel=Light Level - -binniecore.beemodifier.territory=Territory -binniecore.beemodifier.mutation=Mutation -binniecore.beemodifier.lifespan=Lifespan -binniecore.beemodifier.production=Production -binniecore.beemodifier.flowering=Flowering -binniecore.beemodifier.geneticdecay=Genetic Decay - -binniecore.gui.breedingmessage.species=Species Discovered -binniecore.gui.breedingmessage.branch=Branch Discovered -binniecore.gui.breedingmessage.epithet=Epithet Gained - -binniecore.item.container.capsule=Capsule -binniecore.item.container.refractory=Capsule -binniecore.item.container.can=Can -binniecore.item.container.bucket=Bucket -binniecore.item.container.glass=Bottle -binniecore.item.container.cylinder=Cylinder - -binniecore.machine.error.noItem=No Item -binniecore.machine.error.invalidItem=Invalid Item -binniecore.machine.error.noSpace=No Space -binniecore.machine.error.insufficientPower.title=Insufficient Power -binniecore.machine.error.insufficientPower.desc=Not enough power to operate -binniecore.machine.error.tankFull=Tank Full -binniecore.machine.error.insufficientLiquid=Insufficient Liquid - -binniecore.machine.storage.compartment=Compartment -binniecore.machine.storage.compartmentIron=Iron Compartment -binniecore.machine.storage.compartmentDiamond=Diamond Compartment -binniecore.machine.storage.compartmentCopper=Copper Compartment -binniecore.machine.storage.compartmentBronze=Bronze Compartment -binniecore.machine.storage.compartmentGold=Gold Compartment - -< %1$s is the name of the pattern > -binniecore.gui.designer.pattern=%1$s Pattern - -binniecore.gui.database.nodescription=No Description Provided.Hel -binniecore.gui.database.mode.species=Species -binniecore.gui.database.mode.branches=Branches -binniecore.gui.database.mode.breeder=Breeder - -binniecore.gui.temperature.short=Temp. -binniecore.gui.humidity.short=Humid. - -binniecore.gui.tolerated=Tolerated -binniecore.gui.nottolerated=Not Tolerated - -binniecore.gui.design=Design -binniecore.gui.tooltip.info=Info -binniecore.gui.tooltip.help=Help -binniecore.gui.tooltip.help.0=To activate help tooltips, -binniecore.gui.tooltip.help.1=hold down the tab key and -binniecore.gui.tooltip.help.2=mouse over controls. - -binniecore.gui.tooltip.powerSupply=Power Supply -binniecore.gui.tooltip.poweredBy=Powered by %s -binniecore.gui.tooltip.powerBar=Power Bar -binniecore.gui.tooltip.currentPower=Current: %.2f RF (%d%%) -binniecore.gui.tooltip.capacityPower=Capacity: %.2f RF -binniecore.gui.tooltip.usagePower=Usage: %.2f RF -binniecore.gui.tooltip.chargedPower=%d%% charged -binniecore.gui.tooltip.powerInfo=%.2f/%.2f RF - -binniecore.gui.tooltip.tank.full=%d%% full -binniecore.gui.tooltip.tank.amount=%d mB -binniecore.gui.tooltip.tank.empty=Empty -binniecore.gui.tooltip.tank.capacity=Capacity: %d mB -binniecore.gui.tooltip.tank.insertSide=Insert Side: %s -binniecore.gui.tooltip.tank.extractSide=Extract Side: %s -binniecore.gui.tooltip.tank.outputOnlyTank=Output Only Tank -binniecore.gui.tooltip.tank.acceptsAny=Accepts: Any Item -binniecore.gui.tooltip.tank.accepts=Accepts: %s - - -< Descriptions used for effects in the database > -binniecore.allele.extrabees.effect.acid.desc=Dissolves stone and dirt -binniecore.allele.forestry.effectAggressive.desc=Attacks players -binniecore.allele.forestry.effectBeatific.desc=Slowly restores health to players -binniecore.allele.forestry.effectCreeper.desc=Explodes violently on approach -binniecore.allele.extrabees.effect.spawn_creeper.desc=Randomly spawns creepers -binniecore.allele.extrabees.effect.blindness.desc=Blinds players -binniecore.allele.forestry.effectDrunkard.desc=Causes players to become tipsy -binniecore.allele.extrabees.effect.ectoplasm.desc=Creates ectoplasmic webbing binniecore.allele.forestry.effectMisanthrope.desc=Aggressively defends its hive binniecore.allele.forestry.effectExploration.desc=Slowly rewards nearby players with experience -binniecore.allele.forestry.effectFertile.desc=Stimulates nearby blocks -binniecore.allele.extrabees.effect.fireworks.desc=Spontaneously fires fireworks into the sky -binniecore.allele.forestry.effectIgnition.desc=Randomly starts fires -binniecore.allele.forestry.effectGlacial.desc=Slowly freezes over water binniecore.allele.extrabees.effect.gravity.desc=Pulls entities towards the hive -binniecore.allele.extrabees.effect.bonemealsapling.desc=Bonemeals saplings -binniecore.allele.forestry.effectHeroic.desc=Defends their hive against mobs binniecore.allele.extrabees.effect.hunger.desc=Causes players to be hungry -binniecore.allele.extrabees.effect.lightning.desc=Stimulates lightning strikes -binniecore.allele.extrabees.effect.meteor.desc=Causes meteors to fall from the sky -binniecore.allele.extrabees.effect.bonemealmushroom.desc=Bonemeals mushrooms binniecore.allele.forestry.effectMycophilic.desc=Spreads mushrooms and mycelium binniecore.allele.forestry.effectNone.desc=No discernible effects -binniecore.allele.forestry.effectMiasmic.desc=Poisons players -binniecore.allele.extrabees.effect.power.desc=Provides some power to machines -binniecore.allele.forestry.effectRadioactive.desc=Destroys nearby blocks -binniecore.allele.forestry.effectReanimation.desc=Reanimates deceased mobs -binniecore.allele.forestry.effectRepulsion.desc=Naturally encourages mobs to avoid it -binniecore.allele.forestry.effectResurrection.desc=Ressurects deceased mobs -binniecore.allele.extrabees.effect.bonemealfruit.desc=Bonemeals fruit leaves -binniecore.allele.extrabees.effect.spawn_skeleton.desc=Randomly spawns skeletons -binniecore.allele.extrabees.effect.slow.desc=Slows down players -binniecore.allele.forestry.effectSnowing.desc=Causes it to snow -binniecore.allele.extrabees.effect.teleport.desc=Randomly teleports entities -binniecore.allele.extrabees.effect.radioactive.desc=Irradiates approaching players -binniecore.allele.extrabees.effect.water.desc=Fills machines with water -binniecore.allele.extrabees.effect.wither.desc=Withers anyone who approaches -binniecore.allele.extrabees.effect.spawn_zombie.desc=Randomly spawns zombies -binniecore.allele.forestry.effectFestiveEaster.desc=Does nothing diff --git a/src/main/resources/assets/binniecore/lang/en_US.lang b/src/main/resources/assets/binniecore/lang/en_US.lang index 76189fe4..f015e414 100644 --- a/src/main/resources/assets/binniecore/lang/en_US.lang +++ b/src/main/resources/assets/binniecore/lang/en_US.lang @@ -216,7 +216,32 @@ binniecore.gui.designer.pattern=%1$s Pattern binniecore.gui.database.nodescription=No Description Provided. binniecore.gui.database.mode.species=Species binniecore.gui.database.mode.branches=Branches +binniecore.gui.database.mode.branches.count=%d/%d Branches binniecore.gui.database.mode.breeder=Breeder +binniecore.gui.database.discovered.discovered=Discovered Species +binniecore.gui.database.discovered.undiscovered=Undiscovered Species +binniecore.gui.database.species=Species +binniecore.gui.database.species.noDesc=No Description Provided. +binniecore.gui.database.species.count=%d/%d Species +binniecore.gui.database.species.secretsCount=%d/%d Secret Species +binniecore.gui.database.branch.name=%s Branch +binniecore.gui.database.branch.apidae=Apidae %s +binniecore.gui.database.branch.discoveredBy=Discovered by %s +binniecore.gui.database.branch.noDesc=No Description Provided. +binniecore.gui.database.furtherMutations=Further Mutations +binniecore.gui.database.resultantMutations=Resultant Mutations +binniecore.gui.database.descriptor=%s Profile +binniecore.gui.database.time.minute=1 minute +binniecore.gui.database.time.minute=%d minutes +binniecore.gui.database.time.second=1 second +binniecore.gui.database.time.seconds=%d seconds +binniecore.gui.database.time.progress=Progress +binniecore.gui.database.time.notInProgress=Not in Progress +binniecore.gui.database.time.inProgress=In Progress +binniecore.gui.database.time.left=Time Left: %s +binniecore.gui.database.time.total=Total Time: %s +binniecore.gui.database.energyCost.0=Energy Cost: %d RF +binniecore.gui.database.energyCost.1=Energy Cost: %.2f RF / tick binniecore.gui.temperature.short=Temp. binniecore.gui.humidity.short=Humid. diff --git a/src/main/resources/assets/binniecore/lang/ru_RU.lang b/src/main/resources/assets/binniecore/lang/ru_RU.lang index 71a7f6d7..80c752f9 100644 --- a/src/main/resources/assets/binniecore/lang/ru_RU.lang +++ b/src/main/resources/assets/binniecore/lang/ru_RU.lang @@ -216,7 +216,32 @@ binniecore.gui.designer.pattern=%1$s Pattern binniecore.gui.database.nodescription=Нет описания binniecore.gui.database.mode.species=Виды binniecore.gui.database.mode.branches=Семейства +binniecore.gui.database.mode.branches.count=%d/%d ветвей binniecore.gui.database.mode.breeder=Селекция +binniecore.gui.database.discovered.discovered=Найденные виды +binniecore.gui.database.discovered.undiscovered=Ненайденные виды +binniecore.gui.database.species=Виды +binniecore.gui.database.species.noDesc=Описание отсутствует. +binniecore.gui.database.species.count=%d/%d видов +binniecore.gui.database.species.secretsCount=%d/%d секретных видов +binniecore.gui.database.branch.name=%s ветвь +binniecore.gui.database.branch.apidae=Природная %s +binniecore.gui.database.branch.discoveredBy=Найдено игроком %s +binniecore.gui.database.branch.noDesc=Описание отсутствует. +binniecore.gui.database.furtherMutations=Дальнейшие мутации +binniecore.gui.database.resultantMutations=Результирующие мутации +binniecore.gui.database.descriptor=%s +binniecore.gui.database.time.minute=1 минута +binniecore.gui.database.time.minute=%d мин. +binniecore.gui.database.time.second=1 секунда +binniecore.gui.database.time.seconds=%d сек. +binniecore.gui.database.time.progress=Прогресс +binniecore.gui.database.time.notInProgress=Не в прогрессе +binniecore.gui.database.time.inProgress=В прогрессе +binniecore.gui.database.time.left=Осталось времени: %s +binniecore.gui.database.time.total=Всего времени: %s +binniecore.gui.database.energyCost.0=Energy Cost: %d RF +binniecore.gui.database.energyCost.1=Energy Cost: %f RF / tick binniecore.gui.temperature.short=Темп. binniecore.gui.humidity.short=Влаж. diff --git a/src/main/resources/assets/botany/lang/en_GB.lang b/src/main/resources/assets/botany/lang/en_GB.lang index 3b9e2636..ff643a89 100644 --- a/src/main/resources/assets/botany/lang/en_GB.lang +++ b/src/main/resources/assets/botany/lang/en_GB.lang @@ -1,296 +1,8 @@ -botany.tab.botany=Botany - -botany.pigmentedGlass=Pigmented Glass -botany.ceramicBlock=Ceramic Block -botany.ceramicTile=Ceramic Tile -botany.ceramicBricks=Ceramic Bricks -botany.strippedCeramicBricks=Striped Ceramic Bricks -botany.largeCeramicBricks=Large Ceramic Bricks -botany.splitCeramicTile=Split Ceramic Tile -botany.chequeredCeramicTile=Chequered Ceramic Tile -botany.mixedCeramicTile=Mixed Ceramic Tile -botany.verticalCeramicBricks=Vertical Ceramic Bricks -botany.verticalStripedCeramicBricks=Vertical Striped Ceramic Bricks -botany.largeVerticalCeramicBricks=Large Vertical Ceramic Bricks - -botany.ph.acid=Acidic -botany.ph.neutral=Neutral -botany.ph.alkaline=Alkaline - -botany.moisture.dry=Dry -botany.moisture.normal=Normal -botany.moisture.damp=Damp - -botany.plant.weeds=Weeds -botany.plant.longWeeds=Long Weeds -botany.plant.veryLongWeeds=Very Long Weeds -botany.plant.deadFlower=Dead Flower -botany.plant.decayingFlower=Decaying Flower - -botany.soil.soil=Soil -botany.soil.loam=Loam -botany.soil.flowerbed=Flowerbed -botany.soil.weedkiller=Weedkiller - -botany.item.tooltip.holdMore= -botany.item.tooltip.bugged=This item is bugged. Destroy it! -botany.item.tooltip.unknownGenome= -botany.item.tooltip.unknown=Unknown -botany.item.tooltip.hybrid=%s-%s Hybrid -botany.item.tooltip.age=Age: %d -botany.item.tooltip.temperature=Temperature: %s / %s -botany.item.tooltip.moisture=Moisture: %s / %s -botany.item.tooltip.pH=pH: %s / %s -botany.item.tooltip.fertility=Fertility: %dx -botany.item.tooltip.flowerColor1=%1$s, %2$s Stem -botany.item.tooltip.flowerColor2=%1$s and %2$s, %3$s Stem - -botany.item.fieldKit.tooltip.noPaper=No paper -botany.item.fieldKit.tooltip.sheetsOfPaper=%d sheets of paper -botany.item.fieldKit.tooltip.sheetOfPaper=%d sheet of paper - -botany.item.soilMeter.name=Soil Meter -botany.item.pigment.name=Pigment -botany.item.clay.name=Clay -botany.item.botany.name=%1$s %2$s -botany.item.pollen.tag.name=Pollen -botany.item.germling.tag.name=Germling -botany.item.flowerCorrupted.name=Corrupted Flower -botany.item.botanistDatabase.0.name=Botanist Database -botany.item.botanistDatabase.1.name=Master Botanist Database -botany.item.fieldKit.name=Field Kit -botany.item.powderAsh.name=Ash Powder -botany.item.powderPulp.name=Pulp Powder -botany.item.powderMulch.name=Mulch Powder -botany.item.powderSulphur.name=Sulphur Powder botany.item.powderFertiliser.name=Fertiliser Powder -botany.item.powderCompost.name=Compost Powder -botany.item.mortar.name=Mortar -botany.item.weedkiller.name=Weedkiller -item.trowelWood.name=Wooden Trowel -item.trowelStone.name=Stone Trowel -item.trowelIron.name=Iron Trowel -item.trowelGold.name=Gold Trowel -item.trowelDiamond.name=Diamond Trowel - -botany.flower.dandelion=Dandelion -botany.flower.poppy=Poppy -botany.flower.orchid=Orchid -botany.flower.allium=Allium -botany.flower.bluet=Bluet -botany.flower.tulip=Tulip -botany.flower.daisy=Daisy -botany.flower.cornflower=Cornflower -botany.flower.pansy=Pansy -botany.flower.iris=Iris -botany.flower.lavender=Lavender -botany.flower.viola=Viola -botany.flower.daffodil=Daffodil -botany.flower.dahlia=Dahlia -botany.flower.peony=Peony -botany.flower.rose=Rose -botany.flower.lilac=Lilac -botany.flower.hydrangea=Hydrangea -botany.flower.foxglove=Foxglove -botany.flower.zinnia=Zinnia -botany.flower.chrysanthemum=Chrysanthemum -botany.flower.marigold=Marigold -botany.flower.geranium=Geranium -botany.flower.azalea=Azalea -botany.flower.primrose=Primrose -botany.flower.aster=Aster -botany.flower.carnation=Carnation -botany.flower.lily=Lily -botany.flower.yarrow=Yarrow -botany.flower.petunia=Petunia -botany.flower.agapanthus=Agapanthus -botany.flower.fuchsia=Fuchsia -botany.flower.dianthus=Dianthus -botany.flower.forget-me-nots=Forget-me-nots -botany.flower.anemone=Anemone -botany.flower.aquilegia=Aquilegia -botany.flower.edelweiss=Edelweiss -botany.flower.scabious=Scabious -botany.flower.coneflower=Coneflower -botany.flower.gaillardia=Gaillardia -botany.flower.auricula=Auricula -botany.flower.camellia=Camellia -botany.flower.goldenrod=Goldenrod -botany.flower.althea=Althea -botany.flower.penstemon=Penstemon -botany.flower.delphinium=Delphinium -botany.flower.hollyhock=Hollyhock - -botany.colour.double=%s & %s -botany.colour.aquamarine=Aquamarine -botany.colour.black=Black -botany.colour.blue=Deep Blue -botany.colour.brown=Red-Brown -botany.colour.cadetblue=Dull Blue -botany.colour.chocolate=Light Brown -botany.colour.coral=Coral -botany.colour.crimson=Crimson -botany.colour.cyan=Cyan -botany.colour.darkgoldenrod=Dark Bronze -botany.colour.darkgray=Gray -botany.colour.darkgreen=Dark Green -botany.colour.darkkhaki=Dark Beige -botany.colour.darkolivegreen=Dark Olive -botany.colour.darkorange=Red-Orange -botany.colour.darksalmon=Dark Salmon -botany.colour.darkseagreen=Dull Green -botany.colour.darkslateblue=Dark Slate -botany.colour.darkslategray=Dark Teal -botany.colour.darkturquoise=Turquoise -botany.colour.darkviolet=Purple -botany.colour.deeppink=Deep Pink -botany.colour.deepskyblue=Light Blue +botany.colour.darkgray=Grey botany.colour.dimgray=Dark Grey -botany.colour.dodgerblue=Blue -botany.colour.gold=Gold -botany.colour.goldenrod=Bronze botany.colour.gray=Dim Grey -botany.colour.green=Green -botany.colour.hotpink=Pink -botany.colour.indianred=Brick Red -botany.colour.indigo=Indigo -botany.colour.khaki=Beige -botany.colour.lavender=Alice Blue -botany.colour.lemonchiffon=Pale Yellow botany.colour.lightgray=Light Grey -botany.colour.lightseagreen=Dark Turquoise -botany.colour.lightsteelblue=Pale Blue -botany.colour.lime=Lime -botany.colour.limegreen=Light Green -botany.colour.magenta=Magenta -botany.colour.maroon=Maroon -botany.colour.mediumaquamarine=Light Mint -botany.colour.mediumorchid=Light Purple -botany.colour.mediumpurple=Light Slate -botany.colour.mediumseagreen=Mint -botany.colour.mediumvioletred=Purple-Red -botany.colour.mistyrose=Pale Rose -botany.colour.navy=Navy -botany.colour.olive=Dark Yellow -botany.colour.olivedrab=Olive -botany.colour.orange=Orange -botany.colour.palegreen=Pale Green -botany.colour.paleturquoise=Pale Turquoise -botany.colour.palevioletred=Dull Pink -botany.colour.peru=Tan -botany.colour.pink=Pale Pink -botany.colour.plum=Light Mauve -botany.colour.purple=Dark Purple -botany.colour.red=Red -botany.colour.rosybrown=Dull Red -botany.colour.royalblue=Royal Blue -botany.colour.salmon=Salmon -botany.colour.sandybrown=Pale Brown -botany.colour.seagreen=Dark Mint -botany.colour.sienna=Brown -botany.colour.skyblue=Sky Blue -botany.colour.slateblue=Slate Blue -botany.colour.slategray=Slate -botany.colour.springgreen=Spring Green -botany.colour.steelblue=Steel Blue -botany.colour.tan=Pale Tan -botany.colour.teal=Teal -botany.colour.thistle=Pale Purple -botany.colour.turquoise=Light Turquoise -botany.colour.violet=Mauve -botany.colour.wheat=Pale Orange -botany.colour.white=White -botany.colour.yellow=Yellow -botany.colour.yellowgreen=Yellow-Green -botany.effect.none=None - -for.binnie.circuit.garden.dry.manual.fert=Fert. Garden (Dry) -for.binnie.circuit.garden.dry.acid.manual.fert=Fert. Garden (Dry, Acidic) -for.binnie.circuit.garden.dry.neutral.manual.fert=Fert. Garden (Dry, Neutral) -for.binnie.circuit.garden.dry.alkaline.manual.fert=Fert. Garden (Dry, Alkaline) -for.binnie.circuit.garden.normal.manual.fert=Fert. Garden -for.binnie.circuit.garden.normal.acid.manual.fert=Fert. Garden (Acidic) -for.binnie.circuit.garden.normal.neutral.manual.fert=Fert. Garden (Neutral) -for.binnie.circuit.garden.normal.alkaline.manual.fert=Fert. Garden (Alkaline) -for.binnie.circuit.garden.damp.manual.fert=Fert. Garden (Damp) -for.binnie.circuit.garden.damp.acid.manual.fert=Fert. Garden (Damp, Acidic) -for.binnie.circuit.garden.damp.neutral.manual.fert=Fert. Garden (Damp, Neutral) -for.binnie.circuit.garden.damp.alkaline.manual.fert=Fert. Garden (Damp, Alkaline) -for.binnie.circuit.garden.dry.manual=Garden (Dry) -for.binnie.circuit.garden.dry.acid.manual=Garden (Dry, Acidic) -for.binnie.circuit.garden.dry.neutral.manual=Garden (Dry, Neutral) -for.binnie.circuit.garden.dry.alkaline.manual=Garden (Dry, Alkaline) -for.binnie.circuit.garden.normal.manual=Garden -for.binnie.circuit.garden.normal.acid.manual=Garden (Acidic) -for.binnie.circuit.garden.normal.neutral.manual=Garden (Neutral) -for.binnie.circuit.garden.normal.alkaline.manual=Garden (Alkaline) -for.binnie.circuit.garden.damp.manual=Garden (Damp) -for.binnie.circuit.garden.damp.acid.manual=Garden (Damp, Acidic) -for.binnie.circuit.garden.damp.neutral.manual=Garden (Damp, Neutral) -for.binnie.circuit.garden.damp.alkaline.manual=Garden (Damp, Alkaline) -for.binnie.circuit.garden.dry.fert=Fert. Garden (Dry) -for.binnie.circuit.garden.dry.acid.fert=Fert. Garden (Dry, Acidic) -for.binnie.circuit.garden.dry.neutral.fert=Fert. Garden (Dry, Neutral) -for.binnie.circuit.garden.dry.alkaline.fert=Fert. Garden (Dry, Alkaline) -for.binnie.circuit.garden.normal.fert=Fert. Garden -for.binnie.circuit.garden.normal.acid.fert=Fert. Garden (Acidic) -for.binnie.circuit.garden.normal.neutral.fert=Fert. Garden (Neutral) -for.binnie.circuit.garden.normal.alkaline.fert=Fert. Garden (Alkaline) -for.binnie.circuit.garden.damp.fert=Fert. Garden (Damp) -for.binnie.circuit.garden.damp.acid.fert=Fert. Garden (Damp, Acidic) -for.binnie.circuit.garden.damp.neutral.fert=Fert. Garden (Damp, Neutral) -for.binnie.circuit.garden.damp.alkaline.fert=Fert. Garden (Damp, Alkaline) -for.binnie.circuit.garden.dry=Garden (Dry) -for.binnie.circuit.garden.dry.acid=Garden (Dry, Acidic) -for.binnie.circuit.garden.dry.neutral=Garden (Dry, Neutral) -for.binnie.circuit.garden.dry.alkaline=Garden (Dry, Alkaline) -for.binnie.circuit.garden.normal=Garden -for.binnie.circuit.garden.normal.acid=Garden (Acidic) -for.binnie.circuit.garden.normal.neutral=Garden (Neutral) -for.binnie.circuit.garden.normal.alkaline=Garden (Alkaline) -for.binnie.circuit.garden.damp=Garden (Damp) -for.binnie.circuit.garden.damp.acid=Garden (Damp, Acidic) -for.binnie.circuit.garden.damp.neutral=Garden (Damp, Neutral) -for.binnie.circuit.garden.damp.alkaline=Garden (Damp, Alkaline) - -botany.tube.name=Insulated Tube -botany.tube.cooper=Cooper -botany.tube.tin=Tin -botany.tube.bronze=Bronze -botany.tube.iron=Iron -botany.tube.insulate.clay=Clay -botany.tube.insulate.cobblestone=Cobblestone -botany.tube.insulate.sand=Sand -botany.tube.insulate.hardenedClay=Hardened Clay -botany.tube.insulate.smoothStone=Smooth Stone -botany.tube.insulate.sandstone=Sandstone - -botany.gui.controls.colorMixSymbol.chance=Current Chance - %f%% -botany.gui.controls.pageSpeciesFurtherTitle=Resultant Mixes -botany.gui.controls.pageColorFurtherTitle=Further Mixes - -botany.gui.database.name=FlowerDatabase botany.gui.database.tab.colour=Colour -botany.gui.database.tab.species.overview=Overview - -botany.gui.database.tab.genome=Genome -botany.gui.database.tab.genome.temp=Temp. : -botany.gui.database.tab.genome.moist=Moist. : -botany.gui.database.tab.genome.ph=pH. : -botany.gui.database.tab.genome.fertility=Fertility : -botany.gui.database.tab.genome.lifespan=Lifespan : -botany.gui.database.tab.genome.lifespan.value=%s days -botany.gui.database.tab.genome.nectar=Nectar : -botany.gui.database.tab.genome.varieties=Varieties : - -botany.gui.database.tab.species.classification=Classification -botany.gui.database.tab.species.resultant=Resultant Mutations -botany.gui.database.tab.species.further=Further Mutations -botany.gui.database.tab.branches.overview=Overview -botany.gui.database.tab.branches.species=Species -botany.gui.database.tab.breeder=Breeder - -botany.gui.database.tab.colour.resultant=Resultant Mixes -botany.gui.database.tab.colour.further=Further Mixes diff --git a/src/main/resources/assets/botany/lang/en_US.lang b/src/main/resources/assets/botany/lang/en_US.lang index 51bb22c7..42334934 100644 --- a/src/main/resources/assets/botany/lang/en_US.lang +++ b/src/main/resources/assets/botany/lang/en_US.lang @@ -124,7 +124,6 @@ botany.flower.hollyhock=Hollyhock botany.colour.double=%s & %s botany.colour.aquamarine=Aquamarine -botany.colour.aquamarine=Aquamarine botany.colour.black=Black botany.colour.blue=Deep Blue botany.colour.brown=Red-Brown @@ -295,4 +294,3 @@ botany.gui.database.tab.breeder=Breeder botany.gui.database.tab.colour.resultant=Resultant Mixes botany.gui.database.tab.colour.further=Further Mixes - diff --git a/src/main/resources/assets/extrabees/lang/en_GB.lang b/src/main/resources/assets/extrabees/lang/en_GB.lang index 392089fb..8c779f04 100644 --- a/src/main/resources/assets/extrabees/lang/en_GB.lang +++ b/src/main/resources/assets/extrabees/lang/en_GB.lang @@ -1,534 +1,10 @@ -################################################## -## Items - -extrabees.item.comb.barren=Barren Comb -extrabees.item.comb.rotten=Rotten Comb -extrabees.item.comb.bone=Bone Comb -extrabees.item.comb.oil=Oily Comb -extrabees.item.comb.coal=Fossilised Comb -extrabees.item.comb.fuel=Petroleum Comb -extrabees.item.comb.water=Damp Comb -extrabees.item.comb.milk=Milky Comb -extrabees.item.comb.fruit=Fruity Comb -extrabees.item.comb.seed=Seedy Comb -extrabees.item.comb.alcohol=Alcoholic Comb -extrabees.item.comb.stone=Rocky Comb -extrabees.item.comb.redstone=Energetic Comb -extrabees.item.comb.resin=Amber Comb -extrabees.item.comb.ic2energy=Static Comb -extrabees.item.comb.iron=Iron Comb -extrabees.item.comb.gold=Golden Comb -extrabees.item.comb.copper=Copper Comb -extrabees.item.comb.tin=Tin Comb -extrabees.item.comb.silver=Silver Comb -extrabees.item.comb.uranium=Radioactive Comb -extrabees.item.comb.clay=Clay Comb -extrabees.item.comb.old=Old Comb -extrabees.item.comb.fungal=Fungal Comb -extrabees.item.comb.creosote=Tar Comb -extrabees.item.comb.latex=Latex Comb -extrabees.item.comb.acidic=Brimstone Comb -extrabees.item.comb.venomous=Venomous Comb -extrabees.item.comb.slime=Mucous Comb -extrabees.item.comb.blaze=Blaze Comb -extrabees.item.comb.coffee=Caffeinated Comb -extrabees.item.comb.glacial=Glacial Comb -extrabees.item.comb.mint=Minty Comb -extrabees.item.comb.citrus=Citrus Comb -extrabees.item.comb.peat=Peat Comb -extrabees.item.comb.shadow=Shadow Comb -extrabees.item.comb.lead=Leaden Comb -extrabees.item.comb.zinc=Zinc Comb -extrabees.item.comb.titanium=Titanium Comb -extrabees.item.comb.tungsten=Tungsten Comb -extrabees.item.comb.platinum=Platinum Comb -extrabees.item.comb.lapis=Lapis Comb -extrabees.item.comb.emerald=Emerald Comb -extrabees.item.comb.ruby=Ruby Comb -extrabees.item.comb.sapphire=Sapphire Comb -extrabees.item.comb.diamond=Diamond Comb -extrabees.item.comb.red=Red Tinted Comb -extrabees.item.comb.yellow=Yellow Tinted Comb -extrabees.item.comb.blue=Blue Tinted Comb -extrabees.item.comb.green=Green Tinted Comb -extrabees.item.comb.black=Black Tinted Comb -extrabees.item.comb.white=White Tinted Comb -extrabees.item.comb.brown=Brown Tinted Comb -extrabees.item.comb.orange=Orange Tinted Comb -extrabees.item.comb.cyan=Cyan Tinted Comb -extrabees.item.comb.purple=Purple Tinted Comb extrabees.item.comb.gray=Grey Tinted Comb -extrabees.item.comb.lightblue=Light Blue Tinted Comb -extrabees.item.comb.pink=Pink Tinted Comb -extrabees.item.comb.limegreen=Lime Green Tinted Comb -extrabees.item.comb.magenta=Magenta Tinted Comb extrabees.item.comb.lightgray=Light Grey Tinted Comb -extrabees.item.comb.nickel=Nickel Comb -extrabees.item.comb.glowstone=Glowing Comb -extrabees.item.comb.saltpeter=Unstable Comb -extrabees.item.comb.compost=Decomposed Comb -extrabees.item.comb.sawdust=Dusty Comb -extrabees.item.comb.certus=Certus Comb -extrabees.item.comb.enderpearl=Shimmering Comb -extrabees.item.comb.yellorium=Yellorium Comb -extrabees.item.comb.cyanite=Cyanite Comb -extrabees.item.comb.blutonium=Blutonium Comb -extrabees.item.honeydrop.energy=Energy Drop -extrabees.item.honeydrop.acid=Acidic Drop -extrabees.item.honeydrop.poison=Venomous Drop -extrabees.item.honeydrop.apple=Juicy Drop -extrabees.item.honeydrop.citrus=Bitter Drop -extrabees.item.honeydrop.ice=Kelvin Drop -extrabees.item.honeydrop.milk=Milkdew -extrabees.item.honeydrop.seed=Nutdew -extrabees.item.honeydrop.alcohol=Tipsy Drop -extrabees.item.honeydrop.fruit=Fruitdew -extrabees.item.honeydrop.vegetable=Leafy Drop -extrabees.item.honeydrop.pumpkin=Fleshy Drop -extrabees.item.honeydrop.melon=Glistening Drop -extrabees.item.honeydrop.red=Red Tinted Honey -extrabees.item.honeydrop.yellow=Yellow Tinted Honey -extrabees.item.honeydrop.blue=Blue Tinted Honey -extrabees.item.honeydrop.green=Green Tinted Honey -extrabees.item.honeydrop.black=Black Tinted Honey -extrabees.item.honeydrop.white=White Tinted Honey -extrabees.item.honeydrop.brown=Brown Tinted Honey -extrabees.item.honeydrop.orange=Orange Tinted Honey -extrabees.item.honeydrop.cyan=Cyan Tinted Honey -extrabees.item.honeydrop.purple=Purple Tinted Honey extrabees.item.honeydrop.gray=Grey Tinted Honey -extrabees.item.honeydrop.lightblue=Light Blue Tinted Honey -extrabees.item.honeydrop.pink=Pink Tinted Honey -extrabees.item.honeydrop.limegreen=Lime Green Tinted Honey -extrabees.item.honeydrop.magenta=Magenta Tinted Honey extrabees.item.honeydrop.lightgray=Light Grey Tinted Honey -extrabees.item.propolis.water=Watery Propolis -extrabees.item.propolis.oil=Oily Propolis -extrabees.item.propolis.fuel=Petroleum Propolis -extrabees.item.propolis.creosote=Creosote Propolis -extrabees.item.propolis.peat=Peat Propolis - -extrabees.item.honeycrystal=Honey Crystal -extrabees.item.honeycrystal.empty=Depleted Honey Crystal - -extrabees.item.frame.cocoa=Chocolate Frame -extrabees.item.frame.cage=Restraint Frame -extrabees.item.frame.soul=Soul Frame -extrabees.item.frame.clay=Healing Frame -extrabees.item.frame.debug=Nova Frame - -extrabees.item.serum.tooltip.nocharge=Empty -extrabees.item.serum.tooltip.charge1=1 Charge -extrabees.item.serum.tooltip.manycharge=%d Charges -extrabees.item.serum.corrupted=Corrupted Serum -extrabees.item.serum.name=%s Serum -extrabees.item.serum.empty=Empty Serum - -extrabees.item.template.corrupted=Corrupted Template -extrabees.item.template.name=%s Template -extrabees.item.template.empty=Blank Template - -extrabees.item.scentedGear=Scented Gear -extrabees.item.diamondShard=Diamond Fragment -extrabees.item.emeraldShard=Emerald Fragment -extrabees.item.rubyShard=Ruby Fragment -extrabees.item.sapphireShard=Sapphire Fragment -extrabees.item.lapisShard=Lapis Fragment -extrabees.item.ironDust=Iron Grains -extrabees.item.goldDust=Gold Grains -extrabees.item.silverDust=Silver Grains -extrabees.item.platinumDust=Platinum Grains -extrabees.item.copperDust=Copper Grains -extrabees.item.tinDust=Tin Grains -extrabees.item.nickelDust=Nickel Grains -extrabees.item.leadDust=Lead Grains -extrabees.item.zincDust=Zinc Grains -extrabees.item.titaniumDust=Titanium Grains -extrabees.item.tungstenDust=Tungsten Grains -extrabees.item.radioactiveDust=Radioactive Fragments -extrabees.item.coalDust=Coal Grains -extrabees.item.dyeRed=Red Dye -extrabees.item.dyeYellow=Yellow Dye -extrabees.item.dyeBlue=Blue Dye -extrabees.item.dyeGreen=Green Dye -extrabees.item.dyeWhite=White Dye -extrabees.item.dyeBlack=Black Dye -extrabees.item.dyeBrown=Brown Dye -extrabees.item.clayDust=Clay Dust -extrabees.item.yelloriumDust=Yellorium Grains -extrabees.item.blutoniumDust=Blutonium Grains -extrabees.item.cyaniteDust=Cyanite Grains - -extrabees.block.apiaristMachine.name=Apiarist Machine -extrabees.block.geneticMachine.name=Genetic Machine -extrabees.block.advGeneticMachine.name=Advanced Genetic Machine - -extrabees.block.ectoplasm.name=Ectoplasm - -extrabees.block.hive.0=Water Hive -extrabees.block.hive.1=Rock Hive -extrabees.block.hive.2=Nether Hive -extrabees.block.hive.3=Marble Hive - - -################################################## -## Liquids - -extrabees.liquid.acid=Acid -extrabees.liquid.poison=Poison -extrabees.liquid.glacial=Liquid Nitrogen -extrabees.liquid.dna=Liquid DNA - - - - -################################################## -## Machines - -extrabees.machine.alveay.frame=Frame Housing -extrabees.machine.alveay.frame.info=The Frame Housing holds one hive frame to alter a bee's traits. -extrabees.machine.alveay.lighting=Alveary Lighting -extrabees.machine.alveay.lighting.info=The Alveary Lighting tricks bees into thinking it is daylight at night time. -extrabees.machine.alveay.mutator=Mutator -extrabees.machine.alveay.mutator.info=The Mutator uses certain items in order to encourage bee mutation. -extrabees.machine.alveay.rainShield=Rain Shield -extrabees.machine.alveay.rainShield.info=The Rain Shield prevents bees from being affected by rainfall. -extrabees.machine.alveay.stimulator=Electrical Stimulator -extrabees.machine.alveay.stimulator.info=Uses circuits and power to stimulate bees in a way similar to frames. -extrabees.machine.alveay.hatchery=Hatchery -extrabees.machine.alveay.hatchery.info=Collect larvae laid by queen bees inside the alveary. -extrabees.machine.alveay.transmission=Alveary Transmission - - - - -################################################## -## Misc - -extrabees.circuit.layout.stimulator=Electrical Stimulator -extrabees.circuit.layout.stimulator.usage=In Electrical Stimulators -extrabees.tab.genetics=Genetics - -for.binnie.circuit.stimulator.lowvoltage=LV Stimulus -for.binnie.circuit.stimulator.highvoltage=HV Stimulus -for.binnie.circuit.stimulator.plant=Biotic Stimulus -for.binnie.circuit.stimulator.death=Charged Stimulus -for.binnie.circuit.stimulator.life=Gentle Stimulus -for.binnie.circuit.stimulator.nether=Molten Stimulus -for.binnie.circuit.stimulator.mutation=Mutagenic Stimulus -for.binnie.circuit.stimulator.inhibitor=Inhibiting Stimulus -for.binnie.circuit.stimulator.territory=Agitating Stimulus - -extrabees.genetics.quality.awful=Awful -extrabees.genetics.quality.poor=Poor -extrabees.genetics.quality.average=Average -extrabees.genetics.quality.good=Good -extrabees.genetics.quality.excellent=Excellent - -extrabees.genetics.quality.tooltip=%s Quality - -extrabees.genetics.allele.shortest=Shortest -extrabees.genetics.allele.shorter=Shorter -extrabees.genetics.allele.short=Short -extrabees.genetics.allele.shortened=Shortened -extrabees.genetics.allele.normal=Normal -extrabees.genetics.allele.elongated=Elongated -extrabees.genetics.allele.long=Long -extrabees.genetics.allele.longer=Longer -extrabees.genetics.allele.longest=Longest - -extrabees.genetics.allele.slowest=Slowest -extrabees.genetics.allele.slower=Slower -extrabees.genetics.allele.slow=Slow -extrabees.genetics.allele.norm=Normal -extrabees.genetics.allele.fast=Fast -extrabees.genetics.allele.faster=Faster -extrabees.genetics.allele.fastest=Fastest - -extrabees.genetics.allele.low=Low -extrabees.genetics.allele.high=High -extrabees.genetics.allele.maximum=Maximum - -extrabees.genetics.allele.average=Average - -extrabees.genetics.allele.default=Default -extrabees.genetics.allele.large=Large -extrabees.genetics.allele.larger=Larger -extrabees.genetics.allele.largest=Largest - -extrabees.genetics.allele.none=None -extrabees.genetics.allele.both1=Both 1 -extrabees.genetics.allele.both2=Both 2 -extrabees.genetics.allele.both3=Both 3 -extrabees.genetics.allele.both4=Both 4 -extrabees.genetics.allele.both5=Both 5 -extrabees.genetics.allele.up1=Up 1 -extrabees.genetics.allele.up2=Up 2 -extrabees.genetics.allele.up3=Up 3 -extrabees.genetics.allele.up4=Up 4 -extrabees.genetics.allele.up5=Up 5 -extrabees.genetics.allele.down1=Down 1 -extrabees.genetics.allele.down2=Down 2 -extrabees.genetics.allele.down3=Down 3 -extrabees.genetics.allele.down4=Down 4 -extrabees.genetics.allele.down5=Down 5 - -extrabees.genetics.allele.noeffect=Effect Cancellation -extrabees.genetics.allele.noflower=Non-pollination - -extrabees.genetics.allele.lifespan=%s Lifespan -extrabees.genetics.allele.production=%s Production -extrabees.genetics.allele.fertility=%s Fertility -extrabees.genetics.allele.flowering=%s Flowering -extrabees.genetics.allele.territory=%s Territory -extrabees.genetics.allele.tolerance=%s %s Tol. -extrabees.genetics.allele.species=%s Species -extrabees.genetics.allele.effect=%s Effect -extrabees.genetics.allele.flower=%s Pollination -extrabees.genetics.allele.humidity=Humid. -extrabees.genetics.allele.temperature=Temp. -extrabees.genetics.allele.nocturnal=Nocturnal -extrabees.genetics.allele.caveDwelling=Cave Dwelling -extrabees.genetics.allele.tolerantFlyer=Rainfall - -extrabees.genetics.corrupted=Corrupted - - - -extrabees.branch.barren.name=Barren -extrabees.branch.barren.desc=Although initially these bees are considerably useless due to their meagre combs, they can lead onto greater things. -extrabees.branch.hostile.name=Hostile -extrabees.branch.hostile.desc=Prone to summoning monsters out of the blue, these bees nonetheless make useful if distasteful products. -extrabees.branch.rocky.name=Rocky extrabees.branch.rocky.desc=Found amongst the rocks, these bees have very high tolerance to adverse conditions. -extrabees.branch.metallic.name=Rusty -extrabees.branch.metallic2.name=Metallic -extrabees.branch.alloy.name=Alloyed -extrabees.branch.farming.name=Agricultural -extrabees.branch.precious.name=Precious -extrabees.branch.mineral.name=Mineral -extrabees.branch.gemstone.name=Gemstone -extrabees.branch.nuclear.name=Nuclear -extrabees.branch.historic.name=Historic -extrabees.branch.fossilized.name=Fossilised -extrabees.branch.refined.name=Refined -extrabees.branch.aquatic.name=Aquatic -extrabees.branch.saccharine.name=Saccharine -extrabees.branch.volcanic.name=Volcanic -extrabees.branch.viscous.name=Viscous -extrabees.branch.virulent.name=Virulent -extrabees.branch.caustic.name=Caustic -extrabees.branch.energetic.name=Energetic -extrabees.branch.shadow.name=Shadow -extrabees.branch.primary.name=Primary -extrabees.branch.secondary.name=Secondary -extrabees.branch.tertiary.name=Tertiary -extrabees.branch.ftb.name=Beastly -extrabees.branch.quantum.name=Quantum - -extrabees.flowers.water.name=Lily Pads -extrabees.flowers.sugar.name=Reeds -extrabees.flowers.rock.name=Rocks -extrabees.flowers.book.name=Books -extrabees.flowers.dead.name=Dead Bushes -extrabees.flowers.redstone.name=Redstone -extrabees.flowers.wood.name=Wood -extrabees.flowers.leaves.name=Leaves -extrabees.flowers.sapling.name=Saplings -extrabees.flowers.fruit.name=Fruit -extrabees.flowers.mystical.name=Mystical - -extrabees.species.arid.name=Arid -extrabees.species.arid.desc=Fond of dry landscapes, their combs are quite waxy and contain less honey.|Apiarist Manual -extrabees.species.barren.name=Barren -extrabees.species.barren.desc=Preferring deserts, they can live their entire lives without seeing flowers of any kind.|Apiarist Manual -extrabees.species.desolate.name=Desolate -extrabees.species.desolate.desc=They thrive in blasted wastelands where other life simply withers away.|Apiarist Manual -extrabees.species.gnawing.name=Gnawing -extrabees.species.rotten.name=Decaying extrabees.species.rotten.desc=These bees have an unusual attraction to dead, rotting meat and will store it in their combs. The smell also attracts other unsavoury types.|Apiarist Manual -extrabees.species.bone.name=Skeletal -extrabees.species.bone.desc=Largely unable to defend their hives in the wild, they attract other creatures to guard their homes.|Apiarist Manual -extrabees.species.creeper.name=Creepy -extrabees.species.creeper.desc=You're sure to get a bang out of these bees.|Binnie, Apiarist -extrabees.species.decomposing.name=Decomposing -extrabees.species.rock.name=Rocky -extrabees.species.rock.desc=If only I could find them Rolling Bees, then I might get some good music.|Mysterious Apiarist -extrabees.species.stone.name=Tolerant -extrabees.species.stone.desc=Part of their hive is made out of stone and use less wax than before.|Apiarist Manual -extrabees.species.granite.name=Robust -extrabees.species.granite.desc=Capable of burrowing through solid rock, they have an extraordinary affinity for minerals hidden in rocks.|Apiarist Manual -extrabees.species.mineral.name=Resilient -extrabees.species.mineral.desc=Generations of breeding Rocky bees and their offspring has resulted in offspring that have begun to consume minerals as part of their diet.|Apiarist Manual -extrabees.species.copper.name=Corroded -extrabees.species.copper.desc=These are infamous for causing power issues by gnawing on the copper wires in walls.|Apiarist Manual -extrabees.species.tin.name=Tarnished -extrabees.species.tin.desc=Their bodies have a metallic coating, which they shed and incorporate into their combs.|Apiarist Manual -extrabees.species.iron.name=Rusty -extrabees.species.iron.desc=Oh, rusty bees. Do I need a tetanus shot?|Jadedcat, Apiarist -extrabees.species.lead.name=Leaden -extrabees.species.lead.desc="It should be easy to turn these into gold!"|Pahimar, Alchemist -extrabees.species.zinc.name=Galvanized -extrabees.species.titanium.name=Impregnable -extrabees.species.bronze.name=Resolute -extrabees.species.brass.name=Brazen -extrabees.species.steel.name=Fortified -extrabees.species.tungstate.name=Invincible -extrabees.species.gold.name=Glittering -extrabees.species.silver.name=Shining -extrabees.species.electrum.name=Precious -extrabees.species.platinum.name=Valuable -extrabees.species.platinum.desc=Ohhhhh, look how shiny this bee is.|Jadedcat, Apiarist -extrabees.species.lapis.name=Lapis -extrabees.species.sodalite.name=Sodalite -extrabees.species.pyrite.name=Pyrite -extrabees.species.bauxite.name=Bauxite -extrabees.species.cinnabar.name=Cinnabar -extrabees.species.sphalerite.name=Sphalerite -extrabees.species.emerald.name=Emerald -extrabees.species.emerald.desc=Look at this bee, it's even shinier!|Jadedcat, Apiarist -extrabees.species.ruby.name=Ruby -extrabees.species.sapphire.name=Sapphire -extrabees.species.olivine.name=Olivine -extrabees.species.diamond.name=Diamond -extrabees.species.diamond.desc=Oh my god, this is definitely the shiniest bee!|Jadedcat, Apiarist -extrabees.species.unstable.name=Unstable -extrabees.species.nuclear.name=Nuclear -extrabees.species.radioactive.name=Radioactive -extrabees.species.ancient.name=Ancient -extrabees.species.primeval.name=Primeval -extrabees.species.prehistoric.name=Prehistoric -extrabees.species.relic.name=Relic -extrabees.species.coal.name=Fossilised -extrabees.species.resin.name=Resinous -extrabees.species.oil.name=Oily -extrabees.species.peat.name=Preserved -extrabees.species.distilled.name=Distilled -extrabees.species.fuel.name=Refined -extrabees.species.creosote.name=Tarry -extrabees.species.latex.name=Elastic -extrabees.species.water.name=Water -extrabees.species.river.name=River -extrabees.species.ocean.name=Ocean -extrabees.species.ink.name=Stained -extrabees.species.growing.name=Growing -extrabees.species.thriving.name=Thriving -extrabees.species.blooming.name=Blooming -extrabees.species.sweet.name=Sweetened -extrabees.species.sugar.name=Sugary -extrabees.species.ripening.name=Ripening -extrabees.species.fruit.name=Fruity -extrabees.species.alcohol.name=Fermented -extrabees.species.alcohol.desc=Go home bee, you're drunk.|Jadedcat, Apiarist -extrabees.species.farm.name=Farmed -extrabees.species.milk.name=Bovine -extrabees.species.milk.desc="Moo. I mean, Bzzz."|Confused Bee -extrabees.species.coffee.name=Caffeinated -extrabees.species.coffee.desc=The only drawback is that they don't actually brew the coffee for you.|Apiarist Manual -extrabees.species.citrus.name=Citrus -extrabees.species.mint.name=Minty -extrabees.species.swamp.name=Damp -extrabees.species.boggy.name=Sodden -extrabees.species.fungal.name=Fungal -extrabees.species.basalt.name=Embittered -extrabees.species.basalt.desc=It is unknown how they first arrived in the Nether, but its influence has made them aggresive.|Apiarist Manual -extrabees.species.tempered.name=Furious -extrabees.species.tempered.desc=An unusual mutation has activated recessive genes that cause high levels of anger in this bee.|Apiarist Manual -extrabees.species.volcanic.name=Volcanic -extrabees.species.volcanic.desc=At some point during their evolution, they seem to have acquired traits from Blazes.|Apiarist Manual -extrabees.species.malicious.name=Malicious -extrabees.species.infectious.name=Infectious -extrabees.species.virulent.name=Virulent -extrabees.species.viscous.name=Viscous -extrabees.species.glutinous.name=Glutinous -extrabees.species.sticky.name=Sticky -extrabees.species.corrosive.name=Corrosive -extrabees.species.caustic.name=Caustic -extrabees.species.acidic.name=Acidic -extrabees.species.excited.name=Excited -extrabees.species.excited.desc=Redstone acts as a source of extra energy for these bees.|Apiarist Manual -extrabees.species.energetic.name=Energetic -extrabees.species.energetic.desc=Oh my god. Something happened. House on fire, house on fire.|Generikb, Panicked Apiarist -extrabees.species.ecstatic.name=Ecstatic -extrabees.species.ecstatic.desc=After accumulating excessive static electricity from Redstone, they produce powerful lightning arcs. Use caution, and maybe a lightning rod.|Apiarist Manual -extrabees.species.artic.name=Frigid -extrabees.species.freezing.name=Absolute -extrabees.species.shadow.name=Shadowed -extrabees.species.darkened.name=Darkened -extrabees.species.abyss.name=Abyssal -extrabees.species.red.name=Maroon extrabees.species.red.desc=Don't let them sting you, or you may be seeing red.|Apiarist Manual -extrabees.species.yellow.name=Saffron -extrabees.species.yellow.desc=They're dyeing to brighten your day with their honey.|Apiarist Manual -extrabees.species.blue.name=Prussian -extrabees.species.blue.desc="Cheer up, bee. You're looking a little blue."|Mysterious Apiarist -extrabees.species.green.name=Natural extrabees.species.green.desc=Perhaps it is an attempt at camouflage, but these bees have begun producing dyes that match the colour of leaves and grass.|Apiarist Manual -extrabees.species.black.name=Ebony -extrabees.species.white.name=Bleached -extrabees.species.brown.name=Sepia -extrabees.species.orange.name=Amber -extrabees.species.cyan.name=Turquoise -extrabees.species.purple.name=Indigo -extrabees.species.gray.name=Slate -extrabees.species.lightblue.name=Azure -extrabees.species.pink.name=Lavender -extrabees.species.limegreen.name=Lime -extrabees.species.magenta.name=Fuchsia -extrabees.species.lightgray.name=Ashen -extrabees.species.celebratory.name=Celebratory -extrabees.species.jaded.name=Jaded -extrabees.species.jaded.desc=I bred all the bees and all I got is some bloody purple dye!|Jaded, Sengir's Chosen -extrabees.species.glowstone.name=Glowering -extrabees.species.hazardous.name=Hazardous -extrabees.species.nickel.name=Lustered -extrabees.species.invar.name=Lustrous -extrabees.species.quantum.name=Quantum -extrabees.species.spatial.name=Spatial -extrabees.species.unusual.name=Abnormal -extrabees.species.yellorium.name=Yellorium -extrabees.species.cyanite.name=Cyanite -extrabees.species.blutonium.name=Blutonium -extrabees.species.mystical.name=Mystical - -extrabees.effect.ectoplasm.name=Ectoplasm -extrabees.effect.acid.name=Acidic -extrabees.effect.spawn_zombie.name=Zombies -extrabees.effect.spawn_skeleton.name=Skeletons -extrabees.effect.spawn_creeper.name=Creepers -extrabees.effect.lightning.name=Lightning -extrabees.effect.radioactive.name=Unstable -extrabees.effect.meteor.name=Meteor -extrabees.effect.hunger.name=Hunger -extrabees.effect.food.name=Nourishment -extrabees.effect.blindness.name=Darkness -extrabees.effect.confusion.name=Confusion -extrabees.effect.fireworks.name=Fireworks -extrabees.effect.festival.name=Festival -extrabees.effect.birthday.name=Birthday -extrabees.effect.teleport.name=Teleport -extrabees.effect.gravity.name=Gravity -extrabees.effect.thief.name=Antigravity -extrabees.effect.wither.name=Wither -extrabees.effect.water.name=Water -extrabees.effect.slow.name=Slowness -extrabees.effect.bonemealsapling.name=Growth -extrabees.effect.bonemealfruit.name=Ripening -extrabees.effect.bonemealmushroom.name=Mushroom -extrabees.effect.power.name=Power - - - - -extrabees.gui.database.tab.species.overview=Overview -extrabees.gui.database.tab.species.classification=Classification -extrabees.gui.database.tab.species.genome=Genome -extrabees.gui.database.tab.species.products=Products -extrabees.gui.database.tab.species.climate=Climate -extrabees.gui.database.tab.species.resultant=Resultant Mutations -extrabees.gui.database.tab.species.further=Further Mutations -extrabees.gui.database.tab.branches.overview=Overview -extrabees.gui.database.tab.branches.species=Species -extrabees.gui.database.tab.breeder=Breeder diff --git a/src/main/resources/assets/extrabees/lang/en_US.lang b/src/main/resources/assets/extrabees/lang/en_US.lang index 0b56097a..9cfecd49 100644 --- a/src/main/resources/assets/extrabees/lang/en_US.lang +++ b/src/main/resources/assets/extrabees/lang/en_US.lang @@ -181,8 +181,6 @@ extrabees.liquid.glacial=Liquid Nitrogen extrabees.liquid.dna=Liquid DNA - - ################################################## ## Machines @@ -200,9 +198,6 @@ extrabees.machine.alveay.hatchery=Hatchery extrabees.machine.alveay.hatchery.info=Collect larvae laid by queen bees inside the alveary. extrabees.machine.alveay.transmission=Alveary Transmission - - - ################################################## ## Misc @@ -276,7 +271,6 @@ extrabees.genetics.allele.down5=Down 5 extrabees.genetics.allele.noeffect=Effect Cancellation extrabees.genetics.allele.noflower=Non-pollination - extrabees.genetics.allele.lifespan=%s Lifespan extrabees.genetics.allele.production=%s Production extrabees.genetics.allele.fertility=%s Fertility @@ -294,8 +288,6 @@ extrabees.genetics.allele.tolerantFlyer=Rainfall extrabees.genetics.corrupted=Corrupted - - extrabees.branch.barren.name=Barren extrabees.branch.barren.desc=Although initially these bees are considerably useless due to their meagre combs, they can lead onto greater things. extrabees.branch.hostile.name=Hostile @@ -518,9 +510,6 @@ extrabees.effect.bonemealfruit.name=Ripening extrabees.effect.bonemealmushroom.name=Mushroom extrabees.effect.power.name=Power - - - extrabees.gui.database.tab.species.overview=Overview extrabees.gui.database.tab.species.classification=Classification extrabees.gui.database.tab.species.genome=Genome @@ -530,4 +519,4 @@ extrabees.gui.database.tab.species.resultant=Resultant Mutations extrabees.gui.database.tab.species.further=Further Mutations extrabees.gui.database.tab.branches.overview=Overview extrabees.gui.database.tab.branches.species=Species -extrabees.gui.database.tab.breeder=Breeder \ No newline at end of file +extrabees.gui.database.tab.breeder=Breeder diff --git a/src/main/resources/assets/extratrees/lang/en_GB.lang b/src/main/resources/assets/extratrees/lang/en_GB.lang index b3d24654..dc9718d8 100644 --- a/src/main/resources/assets/extratrees/lang/en_GB.lang +++ b/src/main/resources/assets/extratrees/lang/en_GB.lang @@ -1,458 +1,14 @@ -################################################## -## Machines - -extratrees.machine.kitchen.bar=Bar -extratrees.machine.kitchen.bottleRack=Bottle Rack - -extratrees.machine.machine.brewery=Brewery -extratrees.machine.machine.brewery.info=The Brewery uses yeasts, juices and grains to make many kinds of Wines and Beers. -extratrees.machine.machine.distillery=Distillery -extratrees.machine.machine.distillery.info=The Distillery can single, double or triple distil certain alcohols to give brandies, liquors and other spirits. -extratrees.machine.machine.press=Fruit Press extratrees.machine.machine.press.info=The Press squeezes fruit to give various fruit juices. It can be powered or run manually by right clicking. -extratrees.machine.machine.lumbermill=Lumbermill extratrees.machine.machine.lumbermill.info=The Lumbermill converts logs into planks at an increased rate, as well as giving by-products such as sawdust and bark. -extratrees.machine.machine.nursery=Nursery -extratrees.machine.machine.woodworker=Woodworker -extratrees.machine.machine.woodworker.info=The Woodworker creates patterned wooden tiles from two different woods. -extratrees.machine.machine.panelworker=Panelworker -extratrees.machine.machine.panelworker.info=The Panelworker creates patterned wooden panels from two different woods. -extratrees.machine.machine.glassworker=Glassworker -extratrees.machine.machine.glassworker.info=The Glassworker creates patterned stained glass. -extratrees.machine.machine.tileworker=Tileworker -extratrees.machine.machine.tileworker.info=The Tileworker creates patterned ceramic tiles. - - -extratrees.block.planks.fir=Fir -extratrees.block.planks.cedar=Cedar -extratrees.block.planks.hemlock=Hemlock -extratrees.block.planks.cypress=Cypress -extratrees.block.planks.fig=Fig -extratrees.block.planks.beech=Beech -extratrees.block.planks.alder=Alder -extratrees.block.planks.hazel=Hazel -extratrees.block.planks.hornbeam=Hornbeam -extratrees.block.planks.box=Box -extratrees.block.planks.butternut=Butternut -extratrees.block.planks.hickory=Hickory -extratrees.block.planks.whitebeam=Whitebeam -extratrees.block.planks.elm=Elm -extratrees.block.planks.apple=Apple -extratrees.block.planks.yew=Yew -extratrees.block.planks.pear=Pear -extratrees.block.planks.hawthorn=Hawthorn -extratrees.block.planks.rowan=Rowan -extratrees.block.planks.elder=Elder -extratrees.block.planks.maclura=Maclura -extratrees.block.planks.syzgium=Syzgium -extratrees.block.planks.brazilwood=Brazilwood -extratrees.block.planks.logwood=Logwood -extratrees.block.planks.iroko=Iroko -extratrees.block.planks.locust=Locust -extratrees.block.planks.eucalyptus=Eucalyptus -extratrees.block.planks.purpleheart=Purpleheart -extratrees.block.planks.ash=Ash -extratrees.block.planks.holly=Holly -extratrees.block.planks.olive=Olive -extratrees.block.planks.sweetgum=Sweetgum -extratrees.block.planks.rosewood=Rosewood -extratrees.block.planks.gingko=Gingko -extratrees.block.planks.pinkivory=Pink Ivory - -extratrees.block.planks.vanilla.oak=Oak -extratrees.block.planks.vanilla.spruce=Spruce -extratrees.block.planks.vanilla.birch=Birch -extratrees.block.planks.vanilla.jungle=Jungle -extratrees.block.planks.vanilla.darkoak=Dark Oak -extratrees.block.planks.vanilla.acacia=Acacia - -extratrees.block.planks.forestry.larch=Larch -extratrees.block.planks.forestry.teak=Teak -extratrees.block.planks.forestry.acacia=Desert Acacia -extratrees.block.planks.forestry.lime=Lime -extratrees.block.planks.forestry.chestnut=Chestnut -extratrees.block.planks.forestry.wenge=Wenge -extratrees.block.planks.forestry.baobab=Baobab -extratrees.block.planks.forestry.sequoia=Sequoia -extratrees.block.planks.forestry.kapok=Kapok -extratrees.block.planks.forestry.ebony=Ebony -extratrees.block.planks.forestry.mahogany=Mahogany -extratrees.block.planks.forestry.balsa=Balsa -extratrees.block.planks.forestry.willow=Willow -extratrees.block.planks.forestry.walnut=Walnut -extratrees.block.planks.forestry.greenheart=Greenheart -extratrees.block.planks.forestry.cherry=Cherry -extratrees.block.planks.forestry.mahoe=Mahoe -extratrees.block.planks.forestry.poplar=Poplar -extratrees.block.planks.forestry.palm=Palm -extratrees.block.planks.forestry.papaya=Papaya -extratrees.block.planks.forestry.pine=Pine -extratrees.block.planks.forestry.plum=Plum -extratrees.block.planks.forestry.maple=Maple -extratrees.block.planks.forestry.citrus=Citrus -extratrees.block.planks.forestry.giganteum=Giant Sequoia -extratrees.block.planks.forestry.ipe=Ipe -extratrees.block.planks.forestry.padauk=Padauk -extratrees.block.planks.forestry.cocobolo=Cocobolo -extratrees.block.planks.forestry.zebrawood=Zebrawood - -extratrees.block.planks.ebxl.redwood=Redwood -extratrees.block.planks.ebxl.fir=Scottish Fir -extratrees.block.planks.ebxl.acacia=Excel Acacia - - - -extratrees.block.planks.fir.desc=A good sturdy conifer wood.|Lumber Jack -extratrees.block.planks.cedar.desc=A red tinged softwood.|Lumber Jack -extratrees.block.planks.hemlock.desc=Hemlock gives a green hued conifer wood.|Lumber Jack -extratrees.block.planks.cypress.desc=A conifer wood with a slight yellow colouring.|Lumber Jack -extratrees.block.planks.fig.desc=Generally not considered a viable construction wood, nonetheless a useful wood.|Lumber Jack -extratrees.block.planks.beech.desc=A slightly lighter wood, pretty average.|Lumber Jack -extratrees.block.planks.alder.desc=A darker hardwood, doesn't have many discerning properties.|Lumber Jack -extratrees.block.planks.hazel.desc=A lovely pale wood, similar in colour to Birch.|Lumber Jack -extratrees.block.planks.hornbeam.desc=Another average wood, without many interesting properties.|Lumber Jack -extratrees.block.planks.box.desc=One of the palest woods available, but only found on the short box shrub.|Lumber Jack -extratrees.block.planks.butternut.desc=A creamy hued wood, though the tree is more known for its nuts.|Lumber Jack -extratrees.block.planks.hickory.desc=A not particularly remarkable hardwood.|Lumber Jack -extratrees.block.planks.whitebeam.desc=Despite it's name whitebeam has a rather subdued colour.|Lumber Jack -extratrees.block.planks.elm.desc=A rather bright peachy wood.|Lumber Jack -extratrees.block.planks.apple.desc=A very dark wood, making apple trees a very useful cultivar.|Lumber Jack -extratrees.block.planks.yew.desc=A rather attractively hued conifer wood.|Lumber Jack -extratrees.block.planks.pear.desc=Unlike Apple wood, pear wood is not particularly unique.|Lumber Jack -extratrees.block.planks.hawthorn.desc=An average softwood.|Lumber Jack -extratrees.block.planks.rowan.desc=A more subdued wood with nice contrast between the planks.|Lumber Jack -extratrees.block.planks.elder.desc=A average plank without much fanfare.|Lumber Jack -extratrees.block.planks.maclura.desc=A very rich orange hue makes Maclura wood very desirable.|Lumber Jack -extratrees.block.planks.syzgium.desc=With a tinge of pink Syzgium is a very unique wood.|Lumber Jack -extratrees.block.planks.brazilwood.desc=Brazilwood is known for its deep purple shade.|Lumber Jack -extratrees.block.planks.logwood.desc=Logwood is one of the closest you can get to a red wood.|Lumber Jack -extratrees.block.planks.iroko.desc=This attractive dark wood would make a lovely lintel.|Lumber Jack -extratrees.block.planks.locust.desc=Totally unrelated to the devouring insect plague.|Lumber Jack -extratrees.block.planks.eucalyptus.desc=A pinkish wood, more commonly converted to wood pulp.|Lumber Jack -extratrees.block.planks.purpleheart.desc=A deep shade of purple makes this tree aptly named.|Lumber Jack -extratrees.block.planks.ash.desc=Gotta catch 'em all!|Ash Ketchum -extratrees.block.planks.holly.desc=The whitest wood available, just avoid the pointy leaves to get to it.|Lumber Jack -extratrees.block.planks.olive.desc=Coloured in the same way as its fruits, an attractive subdued green.|Lumber Jack -extratrees.block.planks.sweetgum.desc=Yet another average wood, but has a certain character.|Lumber Jack -extratrees.block.planks.rosewood.desc=Used to make chess pieces, this is another strongly hued wood.|Lumber Jack -extratrees.block.planks.gingko.desc=Similar to Boxwood, Gingko wood is very pale.|Lumber Jack -extratrees.block.planks.pinkivory.desc=What can I say. It's very pink.|Lumber Jack - -extratrees.block.planks.vanilla.oak.desc= -extratrees.block.planks.vanilla.spruce.desc= -extratrees.block.planks.vanilla.birch.desc= -extratrees.block.planks.vanilla.jungle.desc= -extratrees.block.planks.vanilla.darkoak.desc= -extratrees.block.planks.vanilla.acacia.desc= - -extratrees.block.planks.forestry.larch.desc= -extratrees.block.planks.forestry.teak.desc= -extratrees.block.planks.forestry.acacia.desc= -extratrees.block.planks.forestry.lime.desc= -extratrees.block.planks.forestry.chestnut.desc= -extratrees.block.planks.forestry.wenge.desc= -extratrees.block.planks.forestry.baobab.desc= -extratrees.block.planks.forestry.sequoia.desc= -extratrees.block.planks.forestry.kapok.desc= -extratrees.block.planks.forestry.ebony.desc= -extratrees.block.planks.forestry.mahogany.desc= -extratrees.block.planks.forestry.balsa.desc= -extratrees.block.planks.forestry.willow.desc= -extratrees.block.planks.forestry.walnut.desc= -extratrees.block.planks.forestry.greenheart.desc= -extratrees.block.planks.forestry.cherry.desc= -extratrees.block.planks.forestry.mahoe.desc= -extratrees.block.planks.forestry.poplar.desc= -extratrees.block.planks.forestry.palm.desc= -extratrees.block.planks.forestry.papaya.desc= -extratrees.block.planks.forestry.pine.desc= -extratrees.block.planks.forestry.plum.desc= -extratrees.block.planks.forestry.maple.desc= -extratrees.block.planks.forestry.citrus.desc= - -< %1$s is name of wood used for door > -extratrees.block.door.name=%1$s Wood Door - -< %1$s is name of wood used for door, %2$s is type of door > -extratrees.block.door.name.adv=%2$s %1$s Wood Door -extratrees.block.door.type.standard= -extratrees.block.door.type.solid=Solid -extratrees.block.door.type.double=Split -extratrees.block.door.type.full=Full - -< %1$s is name of the wood> -extratrees.block.plank.name=%1$s Wood Planks - -< %1$s is name of wood > -extratrees.block.log.name=%1$s Wood - -extratrees.species.orchardapple.name=Orchard Apple extratrees.species.sweetcrabapple.name=Sweet Crab Apple extratrees.species.floweringcrabapple.name=Flowering Crab Apple extratrees.species.prairiecrabapple.name=Prairie Crab Apple -extratrees.species.blackthorn.name=Blackthorn -extratrees.species.cherryplum.name=Cherry Plum -extratrees.species.peach.name=Peach -extratrees.species.nectarine.name=Nectarine -extratrees.species.apricot.name=Apricot -extratrees.species.almond.name=Almond -extratrees.species.wildcherry.name=Wild Cherry -extratrees.species.sourcherry.name=Sour Cherry -extratrees.species.blackcherry.name=Black Cherry -extratrees.species.orange.name=Orange extratrees.species.manderin.name=Mandarin -extratrees.species.satsuma.name=Satsuma -extratrees.species.tangerine.name=Tangerine -extratrees.species.lime.name=Lime -extratrees.species.keylime.name=Key Lime -extratrees.species.fingerlime.name=Finger Lime -extratrees.species.pomelo.name=Pomelo -extratrees.species.grapefruit.name=Grapefruit -extratrees.species.kumquat.name=Kumquat -extratrees.species.citron.name=Citron -extratrees.species.buddhahand.name=Buddha's Hand -extratrees.species.banana.name=Banana -extratrees.species.redbanana.name=Red Banana -extratrees.species.plantain.name=Plantain -extratrees.species.butternut.name=Butternut -extratrees.species.rowan.name=Common Rowan -extratrees.species.hemlock.name=Western Hemlock -extratrees.species.ash.name=Common Ash -extratrees.species.alder.name=Common Alder -extratrees.species.alder.desc=A common tree in wet places and marshes.|Arborist Manual -extratrees.species.beech.name=Common Beech -extratrees.species.beech.desc=An elegant tree with small inedible nuts, used in the manufacture of seed oil.|Arborist Manual -extratrees.species.copperbeech.name=Copper Beech -extratrees.species.copperbeech.desc=Beautiful purple brown leaves make this tree a favourite of gardeners.|Arborist Manual -extratrees.species.aspen.name=Aspen -extratrees.species.yew.name=Common Yew -extratrees.species.cypress.name=Lawson Cypress -extratrees.species.douglasfir.name=Douglas-fir -extratrees.species.hazel.name=Common Hazel -extratrees.species.sycamore.name=Sycamore Fig -extratrees.species.whitebeam.name=Whitebeam -extratrees.species.hawthorn.name=Common Hawthorn -extratrees.species.pecan.name=Pecan -extratrees.species.elm.name=Common Elm -extratrees.species.elder.name=Elderberry -extratrees.species.holly.name=Common Holly -extratrees.species.hornbeam.name=Common Hornbeam -extratrees.species.sallow.name=Great Sallow -extratrees.species.acornoak.name=Acorn Oak -extratrees.species.fir.name=Silver Fir -extratrees.species.cedar.name=Great Cedar -extratrees.species.olive.name=Olive -extratrees.species.redmaple.name=Red Maple -extratrees.species.balsamfir.name=Balsam Fir -extratrees.species.loblollypine.name=Loblolly Pine -extratrees.species.sweetgum.name=Sweetgum -extratrees.species.locust.name=Black Locust -extratrees.species.pear.name=Cultivated Pear extratrees.species.osangeosange.name=Osage-Orange -extratrees.species.oldfustic.name=Old Fustic -extratrees.species.brazilwood.name=Brazilwood -extratrees.species.logwood.name=Logwood -extratrees.species.rosewood.name=Rosewood -extratrees.species.purpleheart.name=Purpleheart -extratrees.species.iroko.name=Iroko -extratrees.species.gingko.name=Ginkgo -extratrees.species.brazilnut.name=Brazil Nut -extratrees.species.rosegum.name=Rose Gum -extratrees.species.swampgum.name=Swamp Gum -extratrees.species.box.name=Boxwood -extratrees.species.clove.name=Clove -extratrees.species.coffee.name=Coffee -extratrees.species.monkeypuzzle.name=Monkey Puzzle -extratrees.species.rainbowgum.name=Rainbow Gum -extratrees.species.pinkivory.name=Pink Ivory -extratrees.species.blackcurrant.name=Blackcurrant -extratrees.species.redcurrant.name=Redcurrant -extratrees.species.blackberry.name=Blackberry -extratrees.species.raspberry.name=Raspberry -extratrees.species.blueberry.name=Blueberry -extratrees.species.cranberry.name=Cranberry -extratrees.species.juniper.name=Juniper -extratrees.species.gooseberry.name=Gooseberry -extratrees.species.goldenraspberry.name=Golden Raspberry -extratrees.species.cinnamon.name=Cinnamon -extratrees.species.coconut.name=Coconut -extratrees.species.cashew.name=Cashew extratrees.species.avacado.name=Avocado -extratrees.species.nutmeg.name=Nutmeg -extratrees.species.allspice.name=Allspice -extratrees.species.chilli.name=Chilli Pepper -extratrees.species.staranise.name=Star Anise -extratrees.species.mango.name=Mango -extratrees.species.starfruit.name=Starfruit -extratrees.species.candlenut.name=Candlenut -extratrees.species.dwarfhazel.name=Dwarf Hazel - - -extratrees.item.food.apple=Apple extratrees.item.food.crabapple=Crab Apple -extratrees.item.food.orange=Orange -extratrees.item.food.kumquat=Kumquat -extratrees.item.food.lime=Lime -extratrees.item.food.wildcherry=Wild Cherry -extratrees.item.food.sourcherry=Sour Cherry -extratrees.item.food.blackcherry=Black Cherry -extratrees.item.food.blackthorn=Blackthorn -extratrees.item.food.cherryplum=Cherry Plum -extratrees.item.food.almond=Almond -extratrees.item.food.apricot=Apricot -extratrees.item.food.grapefruit=Grapefruit -extratrees.item.food.peach=Peach -extratrees.item.food.satsuma=Satsuma extratrees.item.food.buddhahand=Buddha’s Hand -extratrees.item.food.citron=Citron -extratrees.item.food.fingerlime=Finger Lime -extratrees.item.food.keylime=Key Lime extratrees.item.food.manderin=Mandarin -extratrees.item.food.nectarine=Nectarine -extratrees.item.food.pomelo=Pomelo -extratrees.item.food.tangerine=Tangerine -extratrees.item.food.pear=Pear -extratrees.item.food.sandpear=Sand Pear -extratrees.item.food.hazelnut=Hazelnut -extratrees.item.food.butternut=Butternut -extratrees.item.food.beechnut=Beechnut -extratrees.item.food.pecan=Pecan Nut -extratrees.item.food.banana=Banana -extratrees.item.food.redbanana=Red Banana -extratrees.item.food.plantain=Plantain -extratrees.item.food.brazilnut=Brazil Nut -extratrees.item.food.fig=Fig -extratrees.item.food.acorn=Acorn -extratrees.item.food.elderberry=Elderberry -extratrees.item.food.olive=Olive -extratrees.item.food.gingkonut=Gingko Nut -extratrees.item.food.coffee=Coffee -extratrees.item.food.osangeorange=Osage Orange -extratrees.item.food.clove=Clove -extratrees.item.food.papayimar=Papayimar -extratrees.item.food.blackcurrant=Blackcurrant -extratrees.item.food.redcurrant=Redcurrant -extratrees.item.food.blackberry=Blackberry -extratrees.item.food.raspberry=Raspberry -extratrees.item.food.blueberry=Blueberry -extratrees.item.food.cranberry=Cranberry -extratrees.item.food.juniper=Juniper -extratrees.item.food.gooseberry=Gooseberry -extratrees.item.food.goldenraspberry=Golden Raspberry -extratrees.item.food.coconut=Coconut -extratrees.item.food.cashew=Cashew extratrees.item.food.avacado=Avocado -extratrees.item.food.nutmeg=Nutmeg -extratrees.item.food.allspice=Allspice -extratrees.item.food.chilli=Chilli -extratrees.item.food.staranise=Star Anise -extratrees.item.food.mango=Mango -extratrees.item.food.starfruit=Starfruit -extratrees.item.food.candlenut=Candlenut - -extratrees.item.glassware.beermug=Beer Mug -extratrees.item.glassware.pint=Pint Glass -extratrees.item.glassware.snifter=Snifter Glass -extratrees.item.glassware.cocktail=Cocktail Glass -extratrees.item.glassware.cordial=Cordial Glass -extratrees.item.glassware.collins=Collins Glass -extratrees.item.glassware.highball=Highball Glass -extratrees.item.glassware.hurricane=Hurricane Glass -extratrees.item.glassware.margarita=Margarita Glass -extratrees.item.glassware.oldfashioned=Old Fashioned Glass -extratrees.item.glassware.wine=Wine Glass -extratrees.item.glassware.shot=Shot Glass -extratrees.item.glassware.sherry=Sherry Glass -extratrees.item.glassware.coupe=Coupe Glass - -< %1$s is name of fluid > -extratrees.item.glassware.beermug.usage=Mug of %1$s -extratrees.item.glassware.pint.usage=Glass of %1$s -extratrees.item.glassware.snifter.usage=Glass of %1$s -extratrees.item.glassware.cocktail.usage=Glass of %1$s -extratrees.item.glassware.cordial.usage=Glass of %1$s -extratrees.item.glassware.collins.usage=Glass of %1$s -extratrees.item.glassware.highball.usage=Glass of %1$s -extratrees.item.glassware.hurricane.usage=Glass of %1$s -extratrees.item.glassware.margarita.usage=Glass of %1$s -extratrees.item.glassware.oldfashioned.usage=Glass of %1$s -extratrees.item.glassware.wine.usage=Glass of %1$s -extratrees.item.glassware.shot.usage=%1$s Shot -extratrees.item.glassware.sherry.usage=Glass of %1$s -extratrees.item.glassware.coupe.usage=Glass of %1$s - -extratrees.fluid.alcohol.apple=Cider -extratrees.fluid.alcohol.apricot=Apricot Wine -extratrees.fluid.alcohol.banana=Banana Wine -extratrees.fluid.alcohol.cherry=Cherry Wine -extratrees.fluid.alcohol.elderberry=Elderberry Wine -extratrees.fluid.alcohol.peach=Peach Cider -extratrees.fluid.alcohol.pear=Pear Cider -extratrees.fluid.alcohol.plum=Plum Wine -extratrees.fluid.alcohol.carrot=Carrot Wine -extratrees.fluid.alcohol.whitewine=White Wine -extratrees.fluid.alcohol.redwine=Red Wine -extratrees.fluid.alcohol.sparklingwine=Sparkling Wine -extratrees.fluid.alcohol.agave=Agave Wine -extratrees.fluid.alcohol.potato=Fermented Potatoes -extratrees.fluid.alcohol.citrus=Citrus Wine -extratrees.fluid.alcohol.cranberry=Cranberry Wine -extratrees.fluid.alcohol.pineapple=Pineapple Wine -extratrees.fluid.alcohol.tomato=Tomato Wine -extratrees.fluid.alcohol.fruit=Fruit Wine -extratrees.fluid.alcohol.ale=Ale -extratrees.fluid.alcohol.lager=Lager -extratrees.fluid.alcohol.wheatbeer=Wheat Beer -extratrees.fluid.alcohol.ryebeer=Rye Beer -extratrees.fluid.alcohol.cornbeer=Corn Beer -extratrees.fluid.alcohol.stout=Stout -extratrees.fluid.alcohol.barley=Fermented Grain Mash -extratrees.fluid.alcohol.wheat=Fermented Wheat Mash -extratrees.fluid.alcohol.rye=Fermented Rye Mash -extratrees.fluid.alcohol.corn=Fermented Corn Mash - - - -extratrees.gui.database.planks.use=Can make: - -extratrees.gui.database.mode.fruit=Fruit -extratrees.gui.database.mode.wood=Wood -extratrees.gui.database.mode.planks=Planks - -extratrees.gui.database.tab.species.overview=Overview -extratrees.gui.database.tab.species.genome=Genome -extratrees.gui.database.tab.species.classification=Classification -extratrees.gui.database.tab.species.resultant=Resultant Mutations -extratrees.gui.database.tab.species.further=Further Mutations - -extratrees.gui.database.tab.branches.overview=Overview -extratrees.gui.database.tab.branches.species=Species - -extratrees.gui.database.tab.breeder.breeder=Breeder - - -extratrees.gui.database.tab.fruit.natural=Natural Trees -extratrees.gui.database.tab.fruit.natura.help=List of trees that naturally produce this fruit -extratrees.gui.database.tab.fruit.potential=Potential Trees -extratrees.gui.database.tab.fruit.potential.help=List of trees that can produce this fruit if they possess the right allele -extratrees.gui.database.tab.wood.natural=Natural Trees -extratrees.gui.database.tab.wood.natural.help=List of trees that are made of this wood -extratrees.gui.database.tab.planks.overview=Overview -extratrees.gui.database.tab.planks.overview.help=Description and possible uses -extratrees.gui.database.tab.planks.natural=Natural Trees -extratrees.gui.database.tab.planks.natural.help=List of trees that produce logs that can be crafted into this plank - - -extratrees.gui.database.tab.butterfly.species.overview=Overview -extratrees.gui.database.tab.butterfly.species.classification=Classification -extratrees.gui.database.tab.butterfly.species.specimen=Specimen -extratrees.gui.database.tab.butterfly.species.resultant=Resultant Mutations -extratrees.gui.database.tab.butterfly.species.further=Further Mutations -extratrees.gui.database.tab.butterfly.branches.overview=Overview -extratrees.gui.database.tab.butterfly.branches.species=Species -extratrees.gui.database.tab.butterfly.breeder=Breeder - -extratrees.gui.database.log=Log -extratrees.gui.database.leaves=Leaves diff --git a/src/main/resources/assets/genetics/lang/en_GB.lang b/src/main/resources/assets/genetics/lang/en_GB.lang index aadb8d72..6a73a916 100644 --- a/src/main/resources/assets/genetics/lang/en_GB.lang +++ b/src/main/resources/assets/genetics/lang/en_GB.lang @@ -1,119 +1,20 @@ -fluid.polymerisingBacteria=Polymerising Bacteria -fluid.rawDNA=Raw DNA - -genetics.item.casingIron.name=Reinforced Casing -genetics.item.dnaDye.name=DNA Dye -genetics.item.dyeFluor.name=Fluorescent Dye -genetics.item.enzyme.name=Enzyme -genetics.item.growthMedium.name=Growth Medium -genetics.item.sequencerEmpty.name=Blank Sequence -genetics.item.serumEmpty.name=Empty Serum Vial -genetics.item.genomeEmpty.name=Empty Serum Array -genetics.item.cylinderEmpty.name=Glass Cylinder -genetics.item.integratedCircuit.name=Integrated Circuit Board -genetics.item.integratedCPU.name=Integrated CPU -genetics.item.casingCircuit.name=Integrated Casing - -genetics.machine.machine.isolator=Isolator -genetics.machine.machine.isolator.info=The Isolator takes a random allele from a bee, tree or other individual and copies it into an empty sequence vial. This requires the use of ethanol as a solvent and an enzyme to cut up the DNA. The unsequenced serums can then be amplified in a Polymeriser and sequenced in a Sequencer. -genetics.machine.isolator.error.noIndividual=No individual to isolate -genetics.machine.isolator.error.noRoom=No room for DNA sequences -genetics.machine.isolator.error.noVials=No empty sequencer vials -genetics.machine.isolator.error.noLiquid=Insufficient ethanol -genetics.machine.isolator.error.noEnzyme=No enzyme - -genetics.machine.machine.sequencer=Sequencer genetics.machine.machine.sequencer.info=The Sequencer takes unsequenced serums and determines which allele is present in them. This requires the use of fluorescent dye and has a long computational time. -genetics.machine.sequencer.unsequencedDNA=Unsequenced DNA -genetics.machine.sequencer.error.noSequence=No DNA sequence -genetics.machine.sequencer.error.noOwner.title=No Owner -genetics.machine.sequencer.error.noOwner=Replace this block to claim this machine -genetics.machine.sequencer.error.noSpace=No space for empty sequences -genetics.machine.sequencer.gui.sequensedBy=Genes will be sequenced by %s -genetics.machine.sequencer.gui.willNotSave=Userless. Will not save sequences - -genetics.machine.machine.polymeriser=Polymeriser genetics.machine.machine.polymeriser.info=The Polymeriser takes serums and refills them using Raw DNA and replicating bacteria. This can be accelerated using gold nuggets. -genetics.machine.polymeriser.error.noItem=No item to replicate -genetics.machine.polymeriser.error.itemFilled=Item Filled -genetics.machine.polymeriser.error.noLiquid=Insufficient Bacteria -genetics.machine.polymeriser.error.noDNA=Insufficient DNA -genetics.machine.polymeriser.replicatingWithGene=Replicating with 1 gene -genetics.machine.polymeriser.replicatingWithGenes=Replicating with %d genes -genetics.machine.polymeriser.unfilledSerum=Unfilled Serum - -genetics.machine.machine.inoculator=Inoculator genetics.machine.machine.inoculator.info=The Inoculator uses serums to add genes to breedable individuals. This process takes a very long time and requires a Bacteria Vector, but is 100% successful. -genetics.machine.inoculator.error.noIndividual=No Individual to Inoculate -genetics.machine.inoculator.error.noSerum=No Serum -genetics.machine.inoculator.error.noLiquid=Not enough liquid -genetics.machine.inoculator.error.emptySerum.title=Empty Serum -genetics.machine.inoculator.error.emptySerum=Serum is empty -genetics.machine.inoculator.error.invalidSerum.title=Invalid Serum -genetics.machine.inoculator.error.invalidSerum.0=Serum does not hold any genes -genetics.machine.inoculator.error.invalidSerum.1=Mismatch of Serum Type and Target -genetics.machine.inoculator.error.defunctSerum.title=Defunct Serum -genetics.machine.inoculator.error.defunctSerum=Individual already possesses this allele -genetics.machine.inoculator.inoculatingWithGene=Inoculating with 1 gene -genetics.machine.inoculator.inoculatingWithGenes=Inoculating with %d genes -genetics.machine.inoculator.inoculableIndividual=Inoculable Individual -genetics.machine.inoculator.serums=Serum Vials & Arrays - -genetics.machine.labMachine.genepool=Genepool genetics.machine.labMachine.genepool.info=The Genepool uses enzymes and ethanol to break down living things into DNA. All genetic information is lost and the source of the DNA is destroyed. -genetics.machine.genepool.error.noIndividual=No Individual -genetics.machine.genepool.error.noRoom=Not enough room in Tank -genetics.machine.genepool.error.noEthanol=Not enough Ethanol -genetics.machine.genepool.error.insufficientEnzyme=Insufficient Enzyme - -genetics.machine.labMachine.labMachine=Lab Stand genetics.machine.labMachine.analyser=Analyser genetics.machine.labMachine.analyser.info=The Analyser takes breedable individuals and DNA sequencers and analyses them to determine the genes present. This requires DNA Dye, created from purple dye and glowstone -genetics.machine.analyser.dnaDye=DNA Dye genetics.machine.analyser.unanalysedItem=Unanalysed Item genetics.machine.analyser.error.alreadyAnalysed.title=Already Analysed genetics.machine.analyser.error.alreadyAnalysed=Item has already been analysed -genetics.machine.analyser.error.insufficientDye.title=Insufficient Dye genetics.machine.analyser.error.insufficientDye=Not enough DNA dye to analyse genetics.machine.analyser.error.noItem=No item to analyse -genetics.machine.labMachine.incubator=Incubator -genetics.machine.labMachine.incubator.info=The Incubator combines liquids and items and allows them to sit at an ideal temperature to encourage bacterial growth. -genetics.machine.incubator.error.noRecipe.title=No Recipe -genetics.machine.incubator.error.noRecipe=There is no valid recipe -genetics.machine.incubator.error.noLiquid=Not enough incubation liquid -genetics.machine.incubator.error.noRoom=No room for output - genetics.machine.labMachine.acclimatiser=Acclimatiser -genetics.machine.labMachine.acclimatiser.info= genetics.machine.acclimatiser.acclimatizingItems=Acclimatising Items -genetics.machine.acclimatiser.error.noIndividual=No Individual to Acclimatize -genetics.machine.acclimatiser.error.noAcclimatizingItems=No Acclimatizing Items -genetics.machine.acclimatiser.error.invalidAcclimatizingItems=Cannot Acclimatize this individual with these items +genetics.machine.acclimatiser.error.noIndividual=No Individual to Acclimatise +genetics.machine.acclimatiser.error.noAcclimatizingItems=No Acclimatising Items +genetics.machine.acclimatiser.error.invalidAcclimatizingItems=Cannot Acclimatise this individual with these items -genetics.machine.advMachine.splicer=Splicer genetics.machine.advMachine.splicer.info=The Splicer is an incredibly powerful machine to insert genes into individuals. It is fast, but needs insane amounts of power. -genetics.machine.splicer.error.noIndividual=No Individual to Splice -genetics.machine.splicer.error.noSerum=No Serum -genetics.machine.splicer.error.emptySerum.title=Empty Serum -genetics.machine.splicer.error.emptySerum=Serum is empty -genetics.machine.splicer.error.invalidSerum.title=Invalid Serum -genetics.machine.splicer.error.invalidSerum.0=Serum does not hold any genes -genetics.machine.splicer.error.invalidSerum.1=Mismatch of Serum Type and Target -genetics.machine.splicer.error.defunctSerum.title=Defunct Serum -genetics.machine.splicer.error.defunctSerum=Individual already possesses this allele -genetics.machine.splicer.splicableIndividual=Splicable Individual -genetics.machine.splicer.serums=Serum Vials & Arrays -genetics.machine.splicer.splicingIn.0=Splicing in %d/%d genes -genetics.machine.splicer.splicingIn.1=Splicing in %d/%d gene -genetics.machine.splicer.splicingIn.2=Splicing in %d genes -genetics.machine.splicer.splicingIn.3=Splicing in %d gene - -genetics.item.sequence=DNA Sequence -genetics.item.sequence.0=Very Faint -genetics.item.sequence.1=Faint -genetics.item.sequence.2=Weak -genetics.item.sequence.3=Average -genetics.item.sequence.4=Strong -genetics.item.sequence.5=Very Strong