This commit is contained in:
Nedelosk committed 2016-10-27 00:01:23 +02:00
1 parent fe1c8b77c9
commit d7b5954d42
6 files changed
+2 -40

No files matched your search

-1
View File
@@ -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;
@@ -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();
}
@@ -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;
@@ -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" : ""));
}
}
@@ -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();
@@ -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;