From e443efcc5a10bf2e340ed439f5a8d78ad7501d98 Mon Sep 17 00:00:00 2001 From: kordum Date: Sat, 15 Jul 2017 16:14:40 +0300 Subject: [PATCH] Fix #212 Fix wrong localization for Registry and Analyst --- src/main/java/binnie/core/BinnieCore.java | 2 +- src/main/java/binnie/core/item/ModuleItems.java | 2 +- .../java/binnie/core/machines/storage/WindowCompartment.java | 1 - .../binnie/extratrees/craftgui/PageSpeciesTreeGenome.java | 1 - src/main/java/binnie/genetics/gui/WindowAnalyst.java | 4 ++-- 5 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/binnie/core/BinnieCore.java b/src/main/java/binnie/core/BinnieCore.java index 3a023afd..d168b7f7 100644 --- a/src/main/java/binnie/core/BinnieCore.java +++ b/src/main/java/binnie/core/BinnieCore.java @@ -1,7 +1,6 @@ package binnie.core; import binnie.Binnie; -import binnie.genetics.item.ItemFieldKit; import binnie.core.block.MultipassBlockRenderer; import binnie.core.block.TileEntityMetadata; import binnie.core.craftgui.minecraft.ModuleCraftGUI; @@ -24,6 +23,7 @@ import binnie.core.network.IPacketID; import binnie.core.proxy.BinnieProxy; import binnie.core.proxy.IBinnieProxy; import binnie.core.triggers.ModuleTrigger; +import binnie.genetics.item.ItemFieldKit; import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Mod; diff --git a/src/main/java/binnie/core/item/ModuleItems.java b/src/main/java/binnie/core/item/ModuleItems.java index e3c1d38b..af7008a2 100644 --- a/src/main/java/binnie/core/item/ModuleItems.java +++ b/src/main/java/binnie/core/item/ModuleItems.java @@ -3,11 +3,11 @@ package binnie.core.item; import binnie.botany.Botany; import binnie.botany.api.IFlower; import binnie.botany.flower.TileEntityFlower; -import binnie.genetics.item.ItemFieldKit; import binnie.botany.network.PacketID; import binnie.core.BinnieCore; import binnie.core.IInitializable; import binnie.core.network.packet.MessageNBT; +import binnie.genetics.item.ItemFieldKit; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/binnie/core/machines/storage/WindowCompartment.java b/src/main/java/binnie/core/machines/storage/WindowCompartment.java index 2a605f89..82b5f887 100644 --- a/src/main/java/binnie/core/machines/storage/WindowCompartment.java +++ b/src/main/java/binnie/core/machines/storage/WindowCompartment.java @@ -51,7 +51,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import java.util.Arrays; -import java.util.Collections; import java.util.Comparator; import java.util.HashMap; import java.util.LinkedHashMap; diff --git a/src/main/java/binnie/extratrees/craftgui/PageSpeciesTreeGenome.java b/src/main/java/binnie/extratrees/craftgui/PageSpeciesTreeGenome.java index d00eabd0..1c6e1a58 100644 --- a/src/main/java/binnie/extratrees/craftgui/PageSpeciesTreeGenome.java +++ b/src/main/java/binnie/extratrees/craftgui/PageSpeciesTreeGenome.java @@ -14,7 +14,6 @@ import binnie.core.craftgui.minecraft.control.ControlItemDisplay; import binnie.core.genetics.BreedingSystem; import binnie.core.util.I18N; import binnie.extratrees.FakeWorld; -import binnie.extratrees.craftgui.ControlBlockIconDisplay; import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.IAlleleTreeSpecies; import forestry.api.arboriculture.ITree; diff --git a/src/main/java/binnie/genetics/gui/WindowAnalyst.java b/src/main/java/binnie/genetics/gui/WindowAnalyst.java index 82d07c35..8a9a38bc 100644 --- a/src/main/java/binnie/genetics/gui/WindowAnalyst.java +++ b/src/main/java/binnie/genetics/gui/WindowAnalyst.java @@ -115,13 +115,13 @@ public class WindowAnalyst extends Window { @Override public void initialiseClient() { if (isDatabase) { - setTitle(I18N.localise("genetics.item.analyst.name")); - } else { if (isMaster) { setTitle(I18N.localise("genetics.item.registry.1.name")); } else { setTitle(I18N.localise("genetics.item.registry.0.name")); } + } else { + setTitle(I18N.localise("genetics.item.analyst.name")); } getWindowInventory().createSlot(0);