From 2faa08c1b6f9a0149928584b4ecfc736c3ffec48 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Mon, 10 Apr 2017 11:53:54 +0200 Subject: [PATCH] Clean Up --- .../binnie/extratrees/block/EnumShrubLog.java | 7 ----- .../binnie/extratrees/block/FruitPod.java | 3 -- .../binnie/extratrees/block/ModuleBlocks.java | 2 -- .../extratrees/block/wood/BlockShrubLog.java | 7 ----- .../binnie/extratrees/gen/WorldGenBanana.java | 3 -- .../extratrees/genetics/AlleleETFruit.java | 1 - .../extratrees/genetics/ButterflySpecies.java | 29 ------------------- .../extratrees/genetics/ETTreeDefinition.java | 2 -- .../extratrees/genetics/ModuleGenetics.java | 6 ---- 9 files changed, 60 deletions(-) diff --git a/src/main/java/binnie/extratrees/block/EnumShrubLog.java b/src/main/java/binnie/extratrees/block/EnumShrubLog.java index 569276e6..933bee04 100644 --- a/src/main/java/binnie/extratrees/block/EnumShrubLog.java +++ b/src/main/java/binnie/extratrees/block/EnumShrubLog.java @@ -1,13 +1,6 @@ package binnie.extratrees.block; -import java.util.Locale; - -import binnie.Constants; import forestry.api.arboriculture.IWoodType; -import forestry.api.arboriculture.TreeManager; -import forestry.api.arboriculture.WoodBlockKind; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.common.registry.GameRegistry; public enum EnumShrubLog implements IWoodType { INSTANCE; diff --git a/src/main/java/binnie/extratrees/block/FruitPod.java b/src/main/java/binnie/extratrees/block/FruitPod.java index 36057d0a..62cefd4d 100644 --- a/src/main/java/binnie/extratrees/block/FruitPod.java +++ b/src/main/java/binnie/extratrees/block/FruitPod.java @@ -1,8 +1,5 @@ package binnie.extratrees.block; -import binnie.core.BinnieCore; -import forestry.arboriculture.genetics.alleles.AlleleFruit; - import java.util.Locale; public enum FruitPod { diff --git a/src/main/java/binnie/extratrees/block/ModuleBlocks.java b/src/main/java/binnie/extratrees/block/ModuleBlocks.java index 5303730c..040fecba 100644 --- a/src/main/java/binnie/extratrees/block/ModuleBlocks.java +++ b/src/main/java/binnie/extratrees/block/ModuleBlocks.java @@ -30,8 +30,6 @@ import forestry.api.recipes.RecipeManagers; import forestry.arboriculture.WoodAccess; import forestry.arboriculture.blocks.BlockForestryFenceGate; import forestry.arboriculture.blocks.BlockForestryStairs; -import forestry.arboriculture.items.ItemBlockWood; -import forestry.arboriculture.items.ItemBlockWoodDoor; import forestry.core.recipes.RecipeUtil; import forestry.core.utils.OreDictUtil; import net.minecraft.block.Block; diff --git a/src/main/java/binnie/extratrees/block/wood/BlockShrubLog.java b/src/main/java/binnie/extratrees/block/wood/BlockShrubLog.java index eb92eab7..c201d8a2 100644 --- a/src/main/java/binnie/extratrees/block/wood/BlockShrubLog.java +++ b/src/main/java/binnie/extratrees/block/wood/BlockShrubLog.java @@ -8,27 +8,20 @@ import java.util.Random; import javax.annotation.Nullable; import binnie.Constants; -import binnie.core.models.DefaultStateMapper; import binnie.extratrees.block.EnumShrubLog; import forestry.api.arboriculture.IWoodType; import forestry.api.arboriculture.WoodBlockKind; import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; import forestry.api.core.IStateMapperRegister; -import forestry.apiculture.blocks.BlockAlveary; import forestry.arboriculture.IWoodTyped; -import forestry.greenhouse.blocks.BlockGreenhouseDoor; import net.minecraft.block.Block; -import net.minecraft.block.BlockLeaves; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; -import net.minecraft.block.state.pattern.BlockStateMatcher; -import net.minecraft.client.renderer.RenderItem; -import net.minecraft.client.renderer.block.statemap.BlockStateMapper; import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.entity.Entity; import net.minecraft.init.Items; diff --git a/src/main/java/binnie/extratrees/gen/WorldGenBanana.java b/src/main/java/binnie/extratrees/gen/WorldGenBanana.java index a140a659..eb40a3bc 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenBanana.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenBanana.java @@ -4,12 +4,9 @@ import java.util.List; import java.util.Random; import forestry.api.world.ITreeGenData; -import forestry.arboriculture.worldgen.ITreeBlockType; import forestry.arboriculture.worldgen.TreeBlockTypeLeaf; import forestry.core.worldgen.WorldGenHelper; -import forestry.core.worldgen.WorldGenHelper.EnumReplaceMode; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Vec3i; import net.minecraft.world.World; public class WorldGenBanana extends forestry.arboriculture.worldgen.WorldGenTree { diff --git a/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java b/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java index 156c7d14..0ad7a76e 100644 --- a/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java +++ b/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java @@ -36,7 +36,6 @@ import java.lang.reflect.Field; import java.util.HashMap; import java.util.LinkedList; import java.util.List; -import java.util.Locale; import java.util.Map; import java.util.Random; diff --git a/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java b/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java index 74e51114..b5284a5e 100644 --- a/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java +++ b/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java @@ -1,20 +1,9 @@ package binnie.extratrees.genetics; -import binnie.Binnie; import binnie.Constants; -import binnie.core.Mods; -import binnie.core.resource.BinnieResource; -import binnie.core.resource.ResourceType; -import binnie.extratrees.ExtraTrees; -import com.google.common.base.Preconditions; -import com.mojang.authlib.GameProfile; -import forestry.api.core.EnumHumidity; -import forestry.api.core.EnumTemperature; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IClassification; -import forestry.api.genetics.IGenome; -import forestry.api.genetics.IIndividual; import forestry.api.lepidopterology.ButterflyManager; import forestry.api.lepidopterology.EnumButterflyChromosome; import forestry.api.lepidopterology.EnumFlutterType; @@ -23,32 +12,14 @@ import forestry.api.lepidopterology.IAlleleButterflySpeciesBuilder; import forestry.api.lepidopterology.IButterfly; import forestry.api.lepidopterology.IButterflyGenome; import forestry.api.lepidopterology.IButterflyMutationBuilder; -import forestry.api.lepidopterology.IButterflyRoot; -import forestry.apiculture.genetics.IBeeDefinition; import forestry.core.genetics.alleles.AlleleHelper; -import forestry.core.utils.StringUtil; import forestry.lepidopterology.genetics.Butterfly; -import forestry.lepidopterology.genetics.ButterflyBranchDefinition; import forestry.lepidopterology.genetics.ButterflyDefinition; import forestry.lepidopterology.genetics.IButterflyDefinition; import forestry.lepidopterology.genetics.MothDefinition; -import forestry.lepidopterology.genetics.alleles.AlleleButterflySpecies; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; -import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; -import net.minecraftforge.common.BiomeDictionary; - import java.awt.Color; import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.Locale; -import java.util.Map; -import java.util.Set; public enum ButterflySpecies implements IButterflyDefinition { White_Admiral("White Admiral", "Limenitis camilla", 16448250), diff --git a/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java b/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java index 5137bff7..8ee4443f 100644 --- a/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java +++ b/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java @@ -2,7 +2,6 @@ package binnie.extratrees.genetics; import binnie.Constants; import binnie.core.genetics.ForestryAllele; -import binnie.extratrees.ExtraTrees; import binnie.extratrees.block.EnumETLog; import binnie.extratrees.block.EnumShrubLog; import binnie.extratrees.gen.WorldGenAlder; @@ -52,7 +51,6 @@ import forestry.arboriculture.PluginArboriculture; import forestry.arboriculture.genetics.ITreeDefinition; import forestry.arboriculture.genetics.Tree; import forestry.arboriculture.tiles.TileLeaves; -import forestry.arboriculture.worldgen.WorldGenDate; import forestry.arboriculture.worldgen.WorldGenLemon; import forestry.arboriculture.worldgen.WorldGenPlum; import forestry.core.genetics.alleles.AlleleBoolean; diff --git a/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java b/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java index de599f39..42c56c66 100644 --- a/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java +++ b/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java @@ -1,15 +1,9 @@ package binnie.extratrees.genetics; -import binnie.Binnie; import binnie.core.BinnieCore; import binnie.core.IInitializable; -import binnie.extratrees.block.PlankType; import forestry.api.arboriculture.IAlleleFruit; -import forestry.api.arboriculture.ITreeRoot; import forestry.api.genetics.AlleleRegisterEvent; -import forestry.api.genetics.AlleleSpeciesRegisterEvent; -import forestry.api.lepidopterology.IButterflyRoot; -import forestry.arboriculture.genetics.alleles.AlleleFruits; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import java.util.ArrayList;