From a993d706877c865aaf99f5bcd1f06168e9b0ff9a Mon Sep 17 00:00:00 2001 From: kordum Date: Sat, 10 Jun 2017 10:34:25 +0300 Subject: [PATCH] #107 Fix undiscovered species in master database --- .../craftgui/database/ControlDatabaseIndividualDisplay.java | 6 +++--- .../binnie/extrabees/genetics/items/ItemDictionary.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/binnie/core/craftgui/database/ControlDatabaseIndividualDisplay.java b/src/main/java/binnie/core/craftgui/database/ControlDatabaseIndividualDisplay.java index 3c79e33d..6b1449d2 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlDatabaseIndividualDisplay.java +++ b/src/main/java/binnie/core/craftgui/database/ControlDatabaseIndividualDisplay.java @@ -36,12 +36,12 @@ public class ControlDatabaseIndividualDisplay extends ControlItemDisplay impleme Window window = Window.get(this); GameProfile username = window.getUsername(); - if (state == EnumDiscoveryState.UNDETERMINED) { + if (window instanceof WindowAbstractDatabase && ((WindowAbstractDatabase) window).isNEI) { + state = EnumDiscoveryState.SHOW; + } else if (state == EnumDiscoveryState.UNDETERMINED) { state = system.isSpeciesDiscovered(species, window.getWorld(), username) ? EnumDiscoveryState.DISCOVERED : EnumDiscoveryState.UNDISCOVERED; - } else if (window instanceof WindowAbstractDatabase && ((WindowAbstractDatabase) window).isNEI) { - state = EnumDiscoveryState.SHOW; } discovered = state; diff --git a/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java b/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java index 6d41a588..3fe80473 100644 --- a/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java +++ b/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java @@ -34,8 +34,8 @@ public class ItemDictionary extends Item { @Override @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage(int par1) { - return (par1 == 0) ? itemIcon : iconMaster; + public IIcon getIconFromDamage(int damage) { + return (damage == 0) ? itemIcon : iconMaster; } @Override