From d7b5954d4273e867218b49255899faec02e8b2bf Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Thu, 27 Oct 2016 00:01:23 +0200 Subject: [PATCH] Clean Up --- src/main/java/binnie/botany/Botany.java | 1 - .../binnie/botany/gardening/ItemSoil.java | 4 +-- .../botany/genetics/FlowerDefinition.java | 1 - .../botany/genetics/ItemEncyclopedia.java | 31 ------------------- .../botany/genetics/ModuleGenetics.java | 4 --- .../genetics/gui/AnalystPageAppearance.java | 1 - 6 files changed, 2 insertions(+), 40 deletions(-) delete mode 100644 src/main/java/binnie/botany/genetics/ItemEncyclopedia.java diff --git a/src/main/java/binnie/botany/Botany.java b/src/main/java/binnie/botany/Botany.java index dbc21c9a..51762f9f 100644 --- a/src/main/java/binnie/botany/Botany.java +++ b/src/main/java/binnie/botany/Botany.java @@ -18,7 +18,6 @@ import binnie.botany.flower.ItemInsulatedTube; import binnie.botany.flower.TileEntityFlower; import binnie.botany.gardening.*; import binnie.botany.genetics.ItemDictionary; -import binnie.botany.genetics.ItemEncyclopedia; import binnie.botany.genetics.ModuleGenetics; import binnie.botany.items.ItemClay; import binnie.botany.items.ItemPigment; diff --git a/src/main/java/binnie/botany/gardening/ItemSoil.java b/src/main/java/binnie/botany/gardening/ItemSoil.java index fd78cc3f..3a8e5f2f 100644 --- a/src/main/java/binnie/botany/gardening/ItemSoil.java +++ b/src/main/java/binnie/botany/gardening/ItemSoil.java @@ -6,7 +6,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -40,7 +39,8 @@ public class ItemSoil extends ItemBlock { } } - public String getItemStackDisplayName(ItemStack stack){ + @Override + public String getItemStackDisplayName(ItemStack stack){ return this.getUnlocalizedNameInefficiently(stack).trim(); } diff --git a/src/main/java/binnie/botany/genetics/FlowerDefinition.java b/src/main/java/binnie/botany/genetics/FlowerDefinition.java index ced47c61..47cd4cf0 100644 --- a/src/main/java/binnie/botany/genetics/FlowerDefinition.java +++ b/src/main/java/binnie/botany/genetics/FlowerDefinition.java @@ -7,7 +7,6 @@ import forestry.api.core.EnumTemperature; import forestry.api.genetics.*; import forestry.core.genetics.alleles.AlleleHelper; import forestry.core.genetics.alleles.EnumAllele; -import jline.internal.Log; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; diff --git a/src/main/java/binnie/botany/genetics/ItemEncyclopedia.java b/src/main/java/binnie/botany/genetics/ItemEncyclopedia.java deleted file mode 100644 index 841141b2..00000000 --- a/src/main/java/binnie/botany/genetics/ItemEncyclopedia.java +++ /dev/null @@ -1,31 +0,0 @@ -package binnie.botany.genetics; - -import binnie.Binnie; -import binnie.botany.CreativeTabBotany; -import forestry.api.core.IItemModelRegister; -import forestry.api.core.IModelManager; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -public class ItemEncyclopedia extends Item implements IItemModelRegister { - boolean reinforced; - - public ItemEncyclopedia(boolean reinforced) { - this.reinforced = reinforced; - this.setCreativeTab(CreativeTabBotany.instance); - this.setUnlocalizedName("encylopedia" + (reinforced ? "Reinforced" : "")); - this.setMaxStackSize(1); - this.setMaxDamage(reinforced ? 480 : 120); - setRegistryName("encylopedia" + (reinforced ? "Reinforced" : "")); - } - - @Override - public void registerModel(Item item, IModelManager manager) { - manager.registerItemModel(item, 0, "encylopedia" + (this.reinforced ? "Reinforced" : "")); - } - - @Override - public String getItemStackDisplayName(ItemStack itemStack) { - return Binnie.Language.localise("item.botany.encylopedia" + (this.reinforced ? "_reinforced" : "")); - } -} diff --git a/src/main/java/binnie/botany/genetics/ModuleGenetics.java b/src/main/java/binnie/botany/genetics/ModuleGenetics.java index a8b0801b..081cbc7a 100644 --- a/src/main/java/binnie/botany/genetics/ModuleGenetics.java +++ b/src/main/java/binnie/botany/genetics/ModuleGenetics.java @@ -13,10 +13,6 @@ import forestry.api.recipes.RecipeManagers; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.oredict.ShapedOreRecipe; -import net.minecraftforge.oredict.ShapelessOreRecipe; public class ModuleGenetics implements IInitializable { static AlleleEffectNone alleleEffectNone = new AlleleEffectNone(); diff --git a/src/main/java/binnie/genetics/gui/AnalystPageAppearance.java b/src/main/java/binnie/genetics/gui/AnalystPageAppearance.java index e5889ca4..b7d9d7c7 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageAppearance.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageAppearance.java @@ -3,7 +3,6 @@ package binnie.genetics.gui; import binnie.botany.api.IFlower; import binnie.craftgui.botany.ControlColourDisplay; import binnie.craftgui.controls.ControlTextCentered; -import binnie.craftgui.core.CraftGUI; import binnie.craftgui.core.IWidget; import binnie.craftgui.core.geometry.IArea; import binnie.craftgui.minecraft.control.ControlIconDisplay;