diff --git a/src/main/java/binnie/Constants.java b/src/main/java/binnie/Constants.java index bfe7a358..1a1033ba 100644 --- a/src/main/java/binnie/Constants.java +++ b/src/main/java/binnie/Constants.java @@ -1,6 +1,7 @@ package binnie; public final class Constants { + public static final String CORE_MOD_ID = "binniecore"; public static final String BOTANY_MOD_ID = "botany"; public static final String EXTRA_TREES_MOD_ID = "extratrees"; diff --git a/src/main/java/binnie/botany/Botany.java b/src/main/java/binnie/botany/Botany.java index 390ad9c5..095f8d4e 100644 --- a/src/main/java/binnie/botany/Botany.java +++ b/src/main/java/binnie/botany/Botany.java @@ -16,12 +16,7 @@ import binnie.botany.flower.BlockFlower; import binnie.botany.flower.ItemBotany; import binnie.botany.flower.ItemInsulatedTube; import binnie.botany.flower.TileEntityFlower; -import binnie.botany.gardening.BlockPlant; -import binnie.botany.gardening.BlockSoil; -import binnie.botany.gardening.Gardening; -import binnie.botany.gardening.ItemSoilMeter; -import binnie.botany.gardening.ItemTrowel; -import binnie.botany.gardening.ModuleGardening; +import binnie.botany.gardening.*; import binnie.botany.genetics.ItemDictionary; import binnie.botany.genetics.ModuleGenetics; import binnie.botany.items.ItemClay; diff --git a/src/main/java/binnie/botany/api/EnumFlowerChromosome.java b/src/main/java/binnie/botany/api/EnumFlowerChromosome.java index 41e89ae0..d0483486 100644 --- a/src/main/java/binnie/botany/api/EnumFlowerChromosome.java +++ b/src/main/java/binnie/botany/api/EnumFlowerChromosome.java @@ -1,13 +1,6 @@ package binnie.botany.api; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IAlleleArea; -import forestry.api.genetics.IAlleleFloat; -import forestry.api.genetics.IAlleleInteger; -import forestry.api.genetics.IAlleleTolerance; -import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.ISpeciesRoot; +import forestry.api.genetics.*; import java.util.Locale; diff --git a/src/main/java/binnie/botany/ceramic/brick/BlockCeramicBrick.java b/src/main/java/binnie/botany/ceramic/brick/BlockCeramicBrick.java index e7d5a3c2..92d3213d 100644 --- a/src/main/java/binnie/botany/ceramic/brick/BlockCeramicBrick.java +++ b/src/main/java/binnie/botany/ceramic/brick/BlockCeramicBrick.java @@ -10,11 +10,7 @@ import binnie.core.models.DefaultStateMapper; import binnie.core.models.ModelManager; import binnie.core.models.ModelMutlipass; import binnie.core.util.TileUtil; -import forestry.api.core.IItemModelRegister; -import forestry.api.core.IModelManager; -import forestry.api.core.ISpriteRegister; -import forestry.api.core.IStateMapperRegister; -import forestry.api.core.ITextureManager; +import forestry.api.core.*; import forestry.core.blocks.IColoredBlock; import forestry.core.blocks.properties.UnlistedBlockAccess; import forestry.core.blocks.properties.UnlistedBlockPos; @@ -36,11 +32,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockRenderLayer; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.NonNullList; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; diff --git a/src/main/java/binnie/botany/craftgui/ControlColourMixSymbol.java b/src/main/java/binnie/botany/craftgui/ControlColourMixSymbol.java index e0c6fee7..2238ae6f 100644 --- a/src/main/java/binnie/botany/craftgui/ControlColourMixSymbol.java +++ b/src/main/java/binnie/botany/craftgui/ControlColourMixSymbol.java @@ -1,11 +1,7 @@ package binnie.botany.craftgui; import binnie.botany.api.IColourMix; -import binnie.core.craftgui.Attribute; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.ITooltip; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.*; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.resource.Texture; diff --git a/src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java b/src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java index 6586d84f..5da7d68c 100644 --- a/src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java +++ b/src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java @@ -1,11 +1,7 @@ package binnie.botany.craftgui; import binnie.Binnie; -import binnie.botany.api.EnumFlowerChromosome; -import binnie.botany.api.EnumFlowerStage; -import binnie.botany.api.IAlleleFlowerSpecies; -import binnie.botany.api.IFlower; -import binnie.botany.api.IFlowerGenome; +import binnie.botany.api.*; import binnie.botany.core.BotanyCore; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlText; diff --git a/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java b/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java index 39815763..ba56616b 100644 --- a/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java +++ b/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java @@ -7,16 +7,7 @@ import binnie.botany.genetics.EnumFlowerColor; import binnie.core.AbstractMod; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.listbox.ControlListBox; -import binnie.core.craftgui.database.DatabaseTab; -import binnie.core.craftgui.database.IDatabaseMode; -import binnie.core.craftgui.database.PageBranchOverview; -import binnie.core.craftgui.database.PageBranchSpecies; -import binnie.core.craftgui.database.PageBreeder; -import binnie.core.craftgui.database.PageSpeciesClassification; -import binnie.core.craftgui.database.PageSpeciesMutations; -import binnie.core.craftgui.database.PageSpeciesOverview; -import binnie.core.craftgui.database.PageSpeciesResultant; -import binnie.core.craftgui.database.WindowAbstractDatabase; +import binnie.core.craftgui.database.*; import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.minecraft.Window; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/binnie/botany/flower/BlockFlower.java b/src/main/java/binnie/botany/flower/BlockFlower.java index bbb227c5..dec71fac 100644 --- a/src/main/java/binnie/botany/flower/BlockFlower.java +++ b/src/main/java/binnie/botany/flower/BlockFlower.java @@ -29,11 +29,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockRenderLayer; -import net.minecraft.util.EnumBlockRenderType; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.NonNullList; +import net.minecraft.util.*; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; diff --git a/src/main/java/binnie/botany/flower/FlowerSpriteManager.java b/src/main/java/binnie/botany/flower/FlowerSpriteManager.java index 125bef44..48883f62 100644 --- a/src/main/java/binnie/botany/flower/FlowerSpriteManager.java +++ b/src/main/java/binnie/botany/flower/FlowerSpriteManager.java @@ -1,10 +1,5 @@ package binnie.botany.flower; -import java.util.HashMap; -import java.util.Map; - -import javax.annotation.Nullable; - import binnie.Binnie; import binnie.botany.Botany; import binnie.botany.api.IFlowerType; @@ -13,6 +8,10 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nullable; +import java.util.HashMap; +import java.util.Map; + public class FlowerSpriteManager { private static final Map flowerSprites = new HashMap<>(); diff --git a/src/main/java/binnie/botany/flower/ItemBotany.java b/src/main/java/binnie/botany/flower/ItemBotany.java index 27489fa2..1fb0e3f5 100644 --- a/src/main/java/binnie/botany/flower/ItemBotany.java +++ b/src/main/java/binnie/botany/flower/ItemBotany.java @@ -3,12 +3,7 @@ package binnie.botany.flower; import binnie.Binnie; import binnie.botany.Botany; import binnie.botany.CreativeTabBotany; -import binnie.botany.api.EnumFlowerChromosome; -import binnie.botany.api.EnumFlowerStage; -import binnie.botany.api.IAlleleFlowerSpecies; -import binnie.botany.api.IFlower; -import binnie.botany.api.IFlowerGenome; -import binnie.botany.api.IFlowerType; +import binnie.botany.api.*; import binnie.botany.core.BotanyCore; import binnie.botany.genetics.Flower; import com.google.common.base.Preconditions; @@ -31,11 +26,7 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.NonNullList; -import net.minecraft.util.SoundCategory; +import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; diff --git a/src/main/java/binnie/botany/flower/TileEntityFlower.java b/src/main/java/binnie/botany/flower/TileEntityFlower.java index a78590d7..085bfa62 100644 --- a/src/main/java/binnie/botany/flower/TileEntityFlower.java +++ b/src/main/java/binnie/botany/flower/TileEntityFlower.java @@ -2,13 +2,7 @@ package binnie.botany.flower; import binnie.Binnie; import binnie.botany.Botany; -import binnie.botany.api.EnumFlowerStage; -import binnie.botany.api.EnumSoilType; -import binnie.botany.api.IAlleleFlowerSpecies; -import binnie.botany.api.IFlower; -import binnie.botany.api.IFlowerColour; -import binnie.botany.api.IFlowerGenome; -import binnie.botany.api.IFlowerType; +import binnie.botany.api.*; import binnie.botany.core.BotanyCore; import binnie.botany.gardening.BlockPlant; import binnie.botany.gardening.Gardening; diff --git a/src/main/java/binnie/botany/gardening/Gardening.java b/src/main/java/binnie/botany/gardening/Gardening.java index e28c360b..634c1ae1 100644 --- a/src/main/java/binnie/botany/gardening/Gardening.java +++ b/src/main/java/binnie/botany/gardening/Gardening.java @@ -1,11 +1,7 @@ package binnie.botany.gardening; import binnie.botany.Botany; -import binnie.botany.api.EnumAcidity; -import binnie.botany.api.EnumMoisture; -import binnie.botany.api.EnumSoilType; -import binnie.botany.api.IBlockSoil; -import binnie.botany.api.IFlower; +import binnie.botany.api.*; import binnie.botany.flower.TileEntityFlower; import binnie.botany.items.BotanyItems; import binnie.core.BinnieCore; diff --git a/src/main/java/binnie/botany/gardening/ItemTrowel.java b/src/main/java/binnie/botany/gardening/ItemTrowel.java index a8d23f62..a03ad9e2 100644 --- a/src/main/java/binnie/botany/gardening/ItemTrowel.java +++ b/src/main/java/binnie/botany/gardening/ItemTrowel.java @@ -21,11 +21,7 @@ import net.minecraft.init.SoundEvents; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.SoundCategory; +import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/binnie/botany/gardening/ModuleGardening.java b/src/main/java/binnie/botany/gardening/ModuleGardening.java index 70ac56de..ae178f3f 100644 --- a/src/main/java/binnie/botany/gardening/ModuleGardening.java +++ b/src/main/java/binnie/botany/gardening/ModuleGardening.java @@ -5,14 +5,7 @@ import binnie.botany.CreativeTabBotany; import binnie.botany.api.EnumAcidity; import binnie.botany.api.EnumMoisture; import binnie.botany.api.EnumSoilType; -import binnie.botany.ceramic.BlockCeramic; -import binnie.botany.ceramic.BlockCeramicPatterned; -import binnie.botany.ceramic.BlockStainedGlass; -import binnie.botany.ceramic.CeramicTileRecipe; -import binnie.botany.ceramic.ItemCeramic; -import binnie.botany.ceramic.ItemStainedGlass; -import binnie.botany.ceramic.PigmentRecipe; -import binnie.botany.ceramic.TileCeramic; +import binnie.botany.ceramic.*; import binnie.botany.ceramic.brick.BlockCeramicBrick; import binnie.botany.ceramic.brick.ItemCeramicBrick; import binnie.botany.ceramic.brick.TileCeramicBrick; diff --git a/src/main/java/binnie/botany/genetics/AlleleFlowerSpecies.java b/src/main/java/binnie/botany/genetics/AlleleFlowerSpecies.java index 5c6723d3..0dfabd08 100644 --- a/src/main/java/binnie/botany/genetics/AlleleFlowerSpecies.java +++ b/src/main/java/binnie/botany/genetics/AlleleFlowerSpecies.java @@ -1,12 +1,6 @@ package binnie.botany.genetics; -import binnie.botany.api.EnumAcidity; -import binnie.botany.api.EnumFlowerChromosome; -import binnie.botany.api.EnumFlowerStage; -import binnie.botany.api.EnumMoisture; -import binnie.botany.api.IAlleleFlowerSpecies; -import binnie.botany.api.IAlleleFlowerSpeciesBuilder; -import binnie.botany.api.IFlowerType; +import binnie.botany.api.*; import binnie.botany.core.BotanyCore; import forestry.api.core.IModelManager; import forestry.api.genetics.AlleleManager; diff --git a/src/main/java/binnie/botany/genetics/Flower.java b/src/main/java/binnie/botany/genetics/Flower.java index e2bceae3..34d06d64 100644 --- a/src/main/java/binnie/botany/genetics/Flower.java +++ b/src/main/java/binnie/botany/genetics/Flower.java @@ -1,12 +1,6 @@ package binnie.botany.genetics; -import binnie.botany.api.EnumFlowerChromosome; -import binnie.botany.api.IAlleleFlowerSpecies; -import binnie.botany.api.IColourMix; -import binnie.botany.api.IFlower; -import binnie.botany.api.IFlowerColour; -import binnie.botany.api.IFlowerGenome; -import binnie.botany.api.IFlowerMutation; +import binnie.botany.api.*; import binnie.botany.core.BotanyCore; import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.genetics.IAllele; diff --git a/src/main/java/binnie/botany/genetics/FlowerDefinition.java b/src/main/java/binnie/botany/genetics/FlowerDefinition.java index c054027a..88ac03df 100644 --- a/src/main/java/binnie/botany/genetics/FlowerDefinition.java +++ b/src/main/java/binnie/botany/genetics/FlowerDefinition.java @@ -1,29 +1,12 @@ package binnie.botany.genetics; import binnie.Constants; -import binnie.botany.api.EnumAcidity; -import binnie.botany.api.EnumFlowerChromosome; -import binnie.botany.api.EnumFlowerStage; -import binnie.botany.api.EnumMoisture; -import binnie.botany.api.FlowerManager; -import binnie.botany.api.IAlleleFlowerSpecies; -import binnie.botany.api.IAlleleFlowerSpeciesBuilder; -import binnie.botany.api.IFlower; -import binnie.botany.api.IFlowerDefinition; -import binnie.botany.api.IFlowerGenome; -import binnie.botany.api.IFlowerMutationBuilder; -import binnie.botany.api.IFlowerRoot; -import binnie.botany.api.IFlowerType; +import binnie.botany.api.*; import binnie.botany.core.BotanyCore; import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.core.EnumTemperature; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.AlleleSpeciesRegisterEvent; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IAlleleRegistry; -import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.IClassification; +import forestry.api.genetics.*; import forestry.core.genetics.alleles.AlleleHelper; import forestry.core.genetics.alleles.EnumAllele; import net.minecraft.init.Blocks; diff --git a/src/main/java/binnie/botany/genetics/FlowerFactory.java b/src/main/java/binnie/botany/genetics/FlowerFactory.java index f77cb707..ef888966 100644 --- a/src/main/java/binnie/botany/genetics/FlowerFactory.java +++ b/src/main/java/binnie/botany/genetics/FlowerFactory.java @@ -1,11 +1,6 @@ package binnie.botany.genetics; -import binnie.botany.api.FlowerManager; -import binnie.botany.api.IAlleleFlowerSpecies; -import binnie.botany.api.IAlleleFlowerSpeciesBuilder; -import binnie.botany.api.IFlowerFactory; -import binnie.botany.api.IFlowerMutationBuilder; -import binnie.botany.api.IFlowerType; +import binnie.botany.api.*; import binnie.botany.flower.FlowerSpriteManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IClassification; diff --git a/src/main/java/binnie/botany/genetics/FlowerGenome.java b/src/main/java/binnie/botany/genetics/FlowerGenome.java index e13d7c94..9e7cef36 100644 --- a/src/main/java/binnie/botany/genetics/FlowerGenome.java +++ b/src/main/java/binnie/botany/genetics/FlowerGenome.java @@ -1,22 +1,10 @@ package binnie.botany.genetics; import binnie.Binnie; -import binnie.botany.api.EnumAcidity; -import binnie.botany.api.EnumFlowerChromosome; -import binnie.botany.api.EnumMoisture; -import binnie.botany.api.FlowerManager; -import binnie.botany.api.IAlleleFlowerSpecies; -import binnie.botany.api.IFlowerGenome; -import binnie.botany.api.IFlowerType; +import binnie.botany.api.*; import binnie.botany.core.BotanyCore; import forestry.api.core.EnumTemperature; -import forestry.api.genetics.EnumTolerance; -import forestry.api.genetics.IAlleleFloat; -import forestry.api.genetics.IAlleleInteger; -import forestry.api.genetics.IAlleleSpecies; -import forestry.api.genetics.IAlleleTolerance; -import forestry.api.genetics.IChromosome; -import forestry.api.genetics.ISpeciesRoot; +import forestry.api.genetics.*; import forestry.core.genetics.Genome; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/binnie/botany/genetics/FlowerMutation.java b/src/main/java/binnie/botany/genetics/FlowerMutation.java index aaf21a27..7ca5144f 100644 --- a/src/main/java/binnie/botany/genetics/FlowerMutation.java +++ b/src/main/java/binnie/botany/genetics/FlowerMutation.java @@ -1,10 +1,6 @@ package binnie.botany.genetics; -import binnie.botany.api.IAlleleFlowerSpecies; -import binnie.botany.api.IFlowerGenome; -import binnie.botany.api.IFlowerMutation; -import binnie.botany.api.IFlowerMutationBuilder; -import binnie.botany.api.IFlowerRoot; +import binnie.botany.api.*; import binnie.botany.core.BotanyCore; import forestry.api.core.ForestryAPI; import forestry.api.genetics.IAllele; diff --git a/src/main/java/binnie/botany/genetics/FlowerRoot.java b/src/main/java/binnie/botany/genetics/FlowerRoot.java index 35965f73..b23fb46f 100644 --- a/src/main/java/binnie/botany/genetics/FlowerRoot.java +++ b/src/main/java/binnie/botany/genetics/FlowerRoot.java @@ -1,23 +1,9 @@ package binnie.botany.genetics; import binnie.botany.Botany; -import binnie.botany.api.EnumFlowerChromosome; -import binnie.botany.api.EnumFlowerStage; -import binnie.botany.api.IAlleleFlowerSpecies; -import binnie.botany.api.IBotanistTracker; -import binnie.botany.api.IColourMix; -import binnie.botany.api.IFlower; -import binnie.botany.api.IFlowerGenome; -import binnie.botany.api.IFlowerMutation; -import binnie.botany.api.IFlowerRoot; +import binnie.botany.api.*; import com.mojang.authlib.GameProfile; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IAlyzerPlugin; -import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.IIndividual; -import forestry.api.genetics.IMutation; -import forestry.api.genetics.ISpeciesType; +import forestry.api.genetics.*; import forestry.core.genetics.SpeciesRoot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -25,12 +11,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; -import java.util.Random; +import java.util.*; public class FlowerRoot extends SpeciesRoot implements IFlowerRoot { public static int flowerSpeciesCount = -1; diff --git a/src/main/java/binnie/core/BinnieCore.java b/src/main/java/binnie/core/BinnieCore.java index 6dd4eb89..a781faf3 100644 --- a/src/main/java/binnie/core/BinnieCore.java +++ b/src/main/java/binnie/core/BinnieCore.java @@ -7,6 +7,7 @@ import binnie.core.craftgui.minecraft.ModuleCraftGUI; import binnie.core.gui.BinnieCoreGUI; import binnie.core.gui.BinnieGUIHandler; import binnie.core.gui.IBinnieGUID; +import binnie.core.integration.extrabees.ExtraBeesIntegration; import binnie.core.item.ItemFieldKit; import binnie.core.item.ItemGenesis; import binnie.core.item.ModuleItems; @@ -23,7 +24,6 @@ import binnie.core.network.IPacketID; import binnie.core.proxy.BinnieProxy; import binnie.core.proxy.IBinnieProxy; import binnie.core.triggers.ModuleTrigger; - import com.google.common.base.Preconditions; import forestry.api.core.ForestryEvent; import forestry.plugins.PluginManager; @@ -150,6 +150,9 @@ public final class BinnieCore extends AbstractMod { if (Loader.isModLoaded("BuildCraft|Silicon")) { this.addModule(new ModuleTrigger()); } + if (ExtraBeesIntegration.isLoaded()){ + this.addModule(new ExtraBeesIntegration()); + } } @Override @@ -256,7 +259,7 @@ public final class BinnieCore extends AbstractMod { } public static boolean isExtraBeesActive() { - return ConfigurationMods.extraBees && isApicultureActive(); + return ExtraBeesIntegration.isLoaded() && isApicultureActive(); } public static boolean isExtraTreesActive() { diff --git a/src/main/java/binnie/core/craftgui/ITopLevelWidget.java b/src/main/java/binnie/core/craftgui/ITopLevelWidget.java index d42373f8..67db59d4 100644 --- a/src/main/java/binnie/core/craftgui/ITopLevelWidget.java +++ b/src/main/java/binnie/core/craftgui/ITopLevelWidget.java @@ -1,9 +1,9 @@ package binnie.core.craftgui; -import javax.annotation.Nullable; - import binnie.core.craftgui.geometry.Point; +import javax.annotation.Nullable; + public interface ITopLevelWidget extends IWidget { void setMousePosition(final int p0, final int p1); diff --git a/src/main/java/binnie/core/craftgui/TopLevelWidget.java b/src/main/java/binnie/core/craftgui/TopLevelWidget.java index 32b45b9d..df76f736 100644 --- a/src/main/java/binnie/core/craftgui/TopLevelWidget.java +++ b/src/main/java/binnie/core/craftgui/TopLevelWidget.java @@ -4,16 +4,10 @@ import binnie.core.craftgui.events.EventMouse; import binnie.core.craftgui.events.EventWidget; import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.geometry.Point; - import org.lwjgl.input.Mouse; import javax.annotation.Nullable; -import java.util.ArrayDeque; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Deque; -import java.util.List; -import java.util.ListIterator; +import java.util.*; public abstract class TopLevelWidget extends Widget implements ITopLevelWidget { @Nullable diff --git a/src/main/java/binnie/core/craftgui/WindowFieldKit.java b/src/main/java/binnie/core/craftgui/WindowFieldKit.java index 6b1df282..589147d9 100644 --- a/src/main/java/binnie/core/craftgui/WindowFieldKit.java +++ b/src/main/java/binnie/core/craftgui/WindowFieldKit.java @@ -18,14 +18,10 @@ import binnie.core.craftgui.minecraft.control.ControlSlot; import binnie.core.craftgui.resource.StyleSheetPunnett; import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.core.machines.inventory.SlotValidator; -import binnie.extrabees.core.ExtraBeeTexture; +import binnie.extrabees.client.ExtraBeeTexture; import binnie.genetics.gui.ControlChromosome; import binnie.genetics.machine.analyser.Analyser; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.IIndividual; -import forestry.api.genetics.ISpeciesRoot; +import forestry.api.genetics.*; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Items; @@ -36,11 +32,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Random; +import java.util.*; public class WindowFieldKit extends Window { private int glassOffsetX; diff --git a/src/main/java/binnie/core/craftgui/WindowGenesis.java b/src/main/java/binnie/core/craftgui/WindowGenesis.java index c5eef0ff..80ffebc2 100644 --- a/src/main/java/binnie/core/craftgui/WindowGenesis.java +++ b/src/main/java/binnie/core/craftgui/WindowGenesis.java @@ -21,11 +21,7 @@ import binnie.core.craftgui.window.Panel; import binnie.core.genetics.BreedingSystem; import binnie.core.genetics.Gene; import binnie.genetics.gui.ControlGenesisOption; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.IIndividual; -import forestry.api.genetics.ISpeciesRoot; -import forestry.api.genetics.ISpeciesType; +import forestry.api.genetics.*; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/binnie/core/craftgui/controls/ControlTextEdit.java b/src/main/java/binnie/core/craftgui/controls/ControlTextEdit.java index 01c0d2fd..f6f891cf 100644 --- a/src/main/java/binnie/core/craftgui/controls/ControlTextEdit.java +++ b/src/main/java/binnie/core/craftgui/controls/ControlTextEdit.java @@ -5,11 +5,7 @@ import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.controls.core.IControlValue; -import binnie.core.craftgui.events.EventHandler; -import binnie.core.craftgui.events.EventKey; -import binnie.core.craftgui.events.EventMouse; -import binnie.core.craftgui.events.EventTextEdit; -import binnie.core.craftgui.events.EventWidget; +import binnie.core.craftgui.events.*; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import net.minecraft.client.gui.GuiTextField; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/binnie/core/craftgui/controls/button/ControlEnumButton.java b/src/main/java/binnie/core/craftgui/controls/button/ControlEnumButton.java index fc1e1500..68db4fe3 100644 --- a/src/main/java/binnie/core/craftgui/controls/button/ControlEnumButton.java +++ b/src/main/java/binnie/core/craftgui/controls/button/ControlEnumButton.java @@ -4,7 +4,6 @@ import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.core.IControlValue; import binnie.core.craftgui.events.EventMouse; import binnie.core.craftgui.events.EventValueChanged; - import com.google.common.base.Preconditions; import java.util.ArrayList; diff --git a/src/main/java/binnie/core/craftgui/controls/core/Control.java b/src/main/java/binnie/core/craftgui/controls/core/Control.java index 45f7d03b..ee61b3f3 100644 --- a/src/main/java/binnie/core/craftgui/controls/core/Control.java +++ b/src/main/java/binnie/core/craftgui/controls/core/Control.java @@ -1,11 +1,6 @@ package binnie.core.craftgui.controls.core; -import binnie.core.craftgui.Attribute; -import binnie.core.craftgui.ITooltip; -import binnie.core.craftgui.ITooltipHelp; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.Tooltip; -import binnie.core.craftgui.Widget; +import binnie.core.craftgui.*; import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.minecraft.Window; diff --git a/src/main/java/binnie/core/craftgui/controls/core/IControlValue.java b/src/main/java/binnie/core/craftgui/controls/core/IControlValue.java index 6669e1b4..96b83fc2 100644 --- a/src/main/java/binnie/core/craftgui/controls/core/IControlValue.java +++ b/src/main/java/binnie/core/craftgui/controls/core/IControlValue.java @@ -1,9 +1,9 @@ package binnie.core.craftgui.controls.core; -import javax.annotation.Nullable; - import binnie.core.craftgui.IWidget; +import javax.annotation.Nullable; + public interface IControlValue extends IWidget { @Nullable T getValue(); diff --git a/src/main/java/binnie/core/craftgui/controls/tab/ControlTabBar.java b/src/main/java/binnie/core/craftgui/controls/tab/ControlTabBar.java index ed8b532f..4c8ab1ee 100644 --- a/src/main/java/binnie/core/craftgui/controls/tab/ControlTabBar.java +++ b/src/main/java/binnie/core/craftgui/controls/tab/ControlTabBar.java @@ -6,7 +6,6 @@ import binnie.core.craftgui.controls.core.IControlValue; import binnie.core.craftgui.events.EventHandler; import binnie.core.craftgui.events.EventValueChanged; import binnie.core.craftgui.geometry.Position; - import com.google.common.collect.Iterables; import java.util.Collection; diff --git a/src/main/java/binnie/core/craftgui/database/ControlDatabaseIndividualDisplay.java b/src/main/java/binnie/core/craftgui/database/ControlDatabaseIndividualDisplay.java index fa410813..07dc92bb 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlDatabaseIndividualDisplay.java +++ b/src/main/java/binnie/core/craftgui/database/ControlDatabaseIndividualDisplay.java @@ -11,7 +11,6 @@ import binnie.core.craftgui.minecraft.Window; import binnie.core.craftgui.minecraft.control.ControlItemDisplay; import binnie.core.craftgui.renderer.RenderUtil; import binnie.core.genetics.BreedingSystem; - import com.mojang.authlib.GameProfile; import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleSpecies; diff --git a/src/main/java/binnie/core/craftgui/database/ControlMutationSymbol.java b/src/main/java/binnie/core/craftgui/database/ControlMutationSymbol.java index 530b8d01..c3395acf 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlMutationSymbol.java +++ b/src/main/java/binnie/core/craftgui/database/ControlMutationSymbol.java @@ -1,10 +1,6 @@ package binnie.core.craftgui.database; -import binnie.core.craftgui.Attribute; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.ITooltip; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.*; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.minecraft.Window; diff --git a/src/main/java/binnie/core/craftgui/database/ControlSpeciesBox.java b/src/main/java/binnie/core/craftgui/database/ControlSpeciesBox.java index 93aa2416..a4369cb1 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlSpeciesBox.java +++ b/src/main/java/binnie/core/craftgui/database/ControlSpeciesBox.java @@ -3,7 +3,6 @@ package binnie.core.craftgui.database; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.listbox.ControlListBox; import binnie.core.craftgui.minecraft.Window; - import com.mojang.authlib.GameProfile; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IClassification; diff --git a/src/main/java/binnie/core/craftgui/database/PageBreeder.java b/src/main/java/binnie/core/craftgui/database/PageBreeder.java index a698c019..73af4a23 100644 --- a/src/main/java/binnie/core/craftgui/database/PageBreeder.java +++ b/src/main/java/binnie/core/craftgui/database/PageBreeder.java @@ -6,7 +6,6 @@ import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.craftgui.controls.page.ControlPage; import binnie.core.craftgui.minecraft.Window; import binnie.core.genetics.BreedingSystem; - import com.mojang.authlib.GameProfile; import net.minecraft.util.text.TextFormatting; diff --git a/src/main/java/binnie/core/craftgui/database/WindowAbstractDatabase.java b/src/main/java/binnie/core/craftgui/database/WindowAbstractDatabase.java index 3ca0f863..2d01a68f 100644 --- a/src/main/java/binnie/core/craftgui/database/WindowAbstractDatabase.java +++ b/src/main/java/binnie/core/craftgui/database/WindowAbstractDatabase.java @@ -21,7 +21,6 @@ import binnie.core.craftgui.minecraft.Window; import binnie.core.craftgui.minecraft.control.ControlHelp; import binnie.core.craftgui.window.Panel; import binnie.core.genetics.BreedingSystem; - import com.mojang.authlib.GameProfile; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IBreedingTracker; diff --git a/src/main/java/binnie/core/craftgui/events/EventValueChanged.java b/src/main/java/binnie/core/craftgui/events/EventValueChanged.java index 8a4c2979..9f1c4fb3 100644 --- a/src/main/java/binnie/core/craftgui/events/EventValueChanged.java +++ b/src/main/java/binnie/core/craftgui/events/EventValueChanged.java @@ -1,9 +1,9 @@ package binnie.core.craftgui.events; -import javax.annotation.Nullable; - import binnie.core.craftgui.IWidget; +import javax.annotation.Nullable; + public class EventValueChanged extends Event { @Nullable public T value; diff --git a/src/main/java/binnie/core/craftgui/minecraft/ContainerCraftGUI.java b/src/main/java/binnie/core/craftgui/minecraft/ContainerCraftGUI.java index 6044fc4c..b2c98f54 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/ContainerCraftGUI.java +++ b/src/main/java/binnie/core/craftgui/minecraft/ContainerCraftGUI.java @@ -6,39 +6,22 @@ import binnie.core.craftgui.minecraft.control.EnumHighlighting; import binnie.core.machines.IMachine; import binnie.core.machines.Machine; import binnie.core.machines.network.INetwork; -import binnie.core.machines.power.ErrorState; -import binnie.core.machines.power.IErrorStateSource; -import binnie.core.machines.power.IPoweredMachine; -import binnie.core.machines.power.IProcess; -import binnie.core.machines.power.ITankMachine; -import binnie.core.machines.power.PowerInfo; -import binnie.core.machines.power.ProcessInfo; -import binnie.core.machines.power.TankInfo; +import binnie.core.machines.power.*; import binnie.core.machines.transfer.TransferRequest; import binnie.core.network.packet.MessageContainerUpdate; - import com.google.common.base.Preconditions; import com.google.common.collect.Sets; import com.mojang.authlib.GameProfile; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.inventory.ClickType; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.IContainerListener; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; +import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; +import java.util.*; public class ContainerCraftGUI extends Container { private Window window; diff --git a/src/main/java/binnie/core/craftgui/minecraft/ListMap.java b/src/main/java/binnie/core/craftgui/minecraft/ListMap.java index 6529f66b..386c3167 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/ListMap.java +++ b/src/main/java/binnie/core/craftgui/minecraft/ListMap.java @@ -1,12 +1,7 @@ package binnie.core.craftgui.minecraft; import javax.annotation.Nullable; -import java.util.Collection; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.ListIterator; -import java.util.Map; +import java.util.*; // TODO: remove this, it's very questionable class ListMap implements List { diff --git a/src/main/java/binnie/core/craftgui/minecraft/Window.java b/src/main/java/binnie/core/craftgui/minecraft/Window.java index 06b3a964..bf4d3b08 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/Window.java +++ b/src/main/java/binnie/core/craftgui/minecraft/Window.java @@ -3,23 +3,12 @@ package binnie.core.craftgui.minecraft; import binnie.Binnie; import binnie.core.AbstractMod; import binnie.core.BinnieCore; -import binnie.core.craftgui.Attribute; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.ITooltip; -import binnie.core.craftgui.ITooltipHelp; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.Tooltip; -import binnie.core.craftgui.TopLevelWidget; +import binnie.core.craftgui.*; import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.craftgui.events.EventWidget; import binnie.core.craftgui.geometry.Point; -import binnie.core.craftgui.minecraft.control.ControlHelp; -import binnie.core.craftgui.minecraft.control.ControlInfo; -import binnie.core.craftgui.minecraft.control.ControlPowerSystem; -import binnie.core.craftgui.minecraft.control.ControlSlot; -import binnie.core.craftgui.minecraft.control.ControlUser; -import binnie.core.craftgui.minecraft.control.EnumHighlighting; +import binnie.core.craftgui.minecraft.control.*; import binnie.core.craftgui.renderer.RenderUtil; import binnie.core.craftgui.resource.StyleSheetManager; import binnie.core.craftgui.resource.Texture; @@ -33,7 +22,6 @@ import binnie.core.network.packet.MessageCraftGUI; import binnie.core.resource.BinnieResource; import binnie.core.resource.IBinnieTexture; import binnie.core.resource.ResourceType; - import com.google.common.base.Preconditions; import com.mojang.authlib.GameProfile; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlEnergyBar.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlEnergyBar.java index 760ee0c1..4de0e8ec 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlEnergyBar.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlEnergyBar.java @@ -1,10 +1,6 @@ package binnie.core.craftgui.minecraft.control; -import binnie.core.craftgui.Attribute; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.ITooltip; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.*; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.geometry.Point; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlErrorState.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlErrorState.java index 236842de..fe0c4039 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlErrorState.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlErrorState.java @@ -1,10 +1,6 @@ package binnie.core.craftgui.minecraft.control; -import binnie.core.craftgui.Attribute; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.ITooltip; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.*; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.minecraft.CustomSlot; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlHelp.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlHelp.java index 7595eaeb..387a6fa9 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlHelp.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlHelp.java @@ -1,10 +1,6 @@ package binnie.core.craftgui.minecraft.control; -import binnie.core.craftgui.Attribute; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.ITooltip; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.*; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlInfo.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlInfo.java index 879b0bc2..76d255b3 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlInfo.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlInfo.java @@ -1,10 +1,6 @@ package binnie.core.craftgui.minecraft.control; -import binnie.core.craftgui.Attribute; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.ITooltip; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.*; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlLiquidTank.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlLiquidTank.java index 75b68b51..74c89bb3 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlLiquidTank.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlLiquidTank.java @@ -1,11 +1,7 @@ package binnie.core.craftgui.minecraft.control; import binnie.core.BinnieCore; -import binnie.core.craftgui.Attribute; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.ITooltip; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.*; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.events.EventMouse; import binnie.core.craftgui.geometry.Area; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlPowerSystem.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlPowerSystem.java index 5d1a1924..7f448df9 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlPowerSystem.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlPowerSystem.java @@ -1,10 +1,6 @@ package binnie.core.craftgui.minecraft.control; -import binnie.core.craftgui.Attribute; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.ITooltip; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.*; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import binnie.core.machines.power.PowerSystem; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlide.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlide.java index bf78b956..43f80a9a 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlide.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlide.java @@ -4,11 +4,7 @@ import binnie.core.craftgui.Attribute; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.core.Control; -import binnie.core.craftgui.geometry.Area; -import binnie.core.craftgui.geometry.Border; -import binnie.core.craftgui.geometry.Point; -import binnie.core.craftgui.geometry.Position; -import binnie.core.craftgui.geometry.TextJustification; +import binnie.core.craftgui.geometry.*; import binnie.core.craftgui.renderer.RenderUtil; import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlot.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlot.java index 58d8a31a..7e2aa12b 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlot.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlot.java @@ -6,11 +6,7 @@ import binnie.core.craftgui.Tooltip; import binnie.core.craftgui.events.EventMouse; import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.geometry.Point; -import binnie.core.craftgui.minecraft.CustomSlot; -import binnie.core.craftgui.minecraft.GuiCraftGUI; -import binnie.core.craftgui.minecraft.InventoryType; -import binnie.core.craftgui.minecraft.Window; -import binnie.core.craftgui.minecraft.WindowInventory; +import binnie.core.craftgui.minecraft.*; import binnie.core.craftgui.renderer.RenderUtil; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import binnie.core.machines.inventory.InventorySlot; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotBase.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotBase.java index 4ccbff91..dc518dff 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotBase.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotBase.java @@ -1,10 +1,6 @@ package binnie.core.craftgui.minecraft.control; -import binnie.core.craftgui.Attribute; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.ITooltip; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.*; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.events.EventWidget; import binnie.core.craftgui.geometry.Area; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlUser.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlUser.java index bab3f7a6..981f392c 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlUser.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlUser.java @@ -1,10 +1,6 @@ package binnie.core.craftgui.minecraft.control; -import binnie.core.craftgui.Attribute; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.ITooltip; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.*; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/binnie/core/craftgui/renderer/RenderUtil.java b/src/main/java/binnie/core/craftgui/renderer/RenderUtil.java index d47d1224..025d8747 100644 --- a/src/main/java/binnie/core/craftgui/renderer/RenderUtil.java +++ b/src/main/java/binnie/core/craftgui/renderer/RenderUtil.java @@ -4,7 +4,6 @@ import binnie.core.BinnieCore; import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.geometry.TextJustification; - import com.google.common.base.Preconditions; import forestry.api.core.ForestryAPI; import net.minecraft.client.Minecraft; diff --git a/src/main/java/binnie/core/craftgui/resource/StyleSheetPunnett.java b/src/main/java/binnie/core/craftgui/resource/StyleSheetPunnett.java index c5b0bf38..bc17ad71 100644 --- a/src/main/java/binnie/core/craftgui/resource/StyleSheetPunnett.java +++ b/src/main/java/binnie/core/craftgui/resource/StyleSheetPunnett.java @@ -3,8 +3,8 @@ package binnie.core.craftgui.resource; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import binnie.core.craftgui.resource.minecraft.PaddedTexture; import binnie.core.craftgui.resource.minecraft.StandardTexture; -import binnie.extrabees.core.ExtraBeeTexture; -import binnie.extrabees.gui.punnett.ExtraBeeGUITexture; +import binnie.extrabees.client.ExtraBeeTexture; +import binnie.extrabees.client.gui.punnett.ExtraBeeGUITexture; public class StyleSheetPunnett extends StyleSheet { public StyleSheetPunnett() { diff --git a/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUIResourceManager.java b/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUIResourceManager.java index 41d93614..d3c13376 100644 --- a/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUIResourceManager.java +++ b/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUIResourceManager.java @@ -5,7 +5,6 @@ import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.geometry.Border; import binnie.core.craftgui.resource.Texture; import binnie.core.resource.IBinnieTexture; - import com.google.common.base.Charsets; import com.google.gson.JsonElement; import com.google.gson.JsonObject; diff --git a/src/main/java/binnie/core/genetics/BreedingSystem.java b/src/main/java/binnie/core/genetics/BreedingSystem.java index d6fa67e8..3891a073 100644 --- a/src/main/java/binnie/core/genetics/BreedingSystem.java +++ b/src/main/java/binnie/core/genetics/BreedingSystem.java @@ -5,18 +5,7 @@ import binnie.core.BinnieCore; import binnie.core.resource.BinnieSprite; import com.mojang.authlib.GameProfile; import forestry.api.core.ForestryEvent; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IAlleleBoolean; -import forestry.api.genetics.IAlleleSpecies; -import forestry.api.genetics.IBreedingTracker; -import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.IClassification; -import forestry.api.genetics.IGenome; -import forestry.api.genetics.IIndividual; -import forestry.api.genetics.IMutation; -import forestry.api.genetics.ISpeciesRoot; -import forestry.api.genetics.ISpeciesType; +import forestry.api.genetics.*; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -27,15 +16,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.TreeSet; +import java.util.*; public abstract class BreedingSystem implements IItemStackRepresentitive { protected BinnieSprite iconUndiscovered; diff --git a/src/main/java/binnie/core/genetics/ManagerGenetics.java b/src/main/java/binnie/core/genetics/ManagerGenetics.java index f049a148..b917a9f3 100644 --- a/src/main/java/binnie/core/genetics/ManagerGenetics.java +++ b/src/main/java/binnie/core/genetics/ManagerGenetics.java @@ -11,16 +11,7 @@ import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.IBeeRoot; import forestry.api.arboriculture.ITreeRoot; import forestry.api.arboriculture.TreeManager; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.EnumTolerance; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IAlleleFloat; -import forestry.api.genetics.IAlleleInteger; -import forestry.api.genetics.IAlleleSpecies; -import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.IGenome; -import forestry.api.genetics.IIndividual; -import forestry.api.genetics.ISpeciesRoot; +import forestry.api.genetics.*; import forestry.api.lepidopterology.ButterflyManager; import forestry.api.lepidopterology.IButterflyRoot; import net.minecraft.item.ItemStack; @@ -29,13 +20,7 @@ import net.minecraftforge.event.world.WorldEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Comparator; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.TreeSet; +import java.util.*; public class ManagerGenetics extends ManagerBase { public BreedingSystem beeBreedingSystem; diff --git a/src/main/java/binnie/core/genetics/MothBreedingSystem.java b/src/main/java/binnie/core/genetics/MothBreedingSystem.java index 5c06a3de..b152b17c 100644 --- a/src/main/java/binnie/core/genetics/MothBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/MothBreedingSystem.java @@ -3,14 +3,7 @@ package binnie.core.genetics; import binnie.Binnie; import binnie.core.BinnieCore; import binnie.extratrees.ExtraTrees; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IAlleleInteger; -import forestry.api.genetics.IAlleleSpecies; -import forestry.api.genetics.IBreedingTracker; -import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.IMutation; -import forestry.api.genetics.ISpeciesRoot; -import forestry.api.genetics.ISpeciesType; +import forestry.api.genetics.*; import forestry.api.lepidopterology.EnumButterflyChromosome; import forestry.api.lepidopterology.EnumFlutterType; import forestry.api.lepidopterology.ILepidopteristTracker; diff --git a/src/main/java/binnie/core/genetics/TreeBreedingSystem.java b/src/main/java/binnie/core/genetics/TreeBreedingSystem.java index 5de56b52..4126b163 100644 --- a/src/main/java/binnie/core/genetics/TreeBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/TreeBreedingSystem.java @@ -6,36 +6,14 @@ import binnie.core.util.UniqueItemStackSet; import binnie.extratrees.ExtraTrees; import binnie.extratrees.machines.lumbermill.LumbermillRecipes; import com.mojang.authlib.GameProfile; -import forestry.api.arboriculture.EnumGermlingType; -import forestry.api.arboriculture.EnumTreeChromosome; -import forestry.api.arboriculture.IAlleleFruit; -import forestry.api.arboriculture.IAlleleTreeSpecies; -import forestry.api.arboriculture.IArboristTracker; -import forestry.api.arboriculture.IFruitProvider; -import forestry.api.arboriculture.ITreeGenome; -import forestry.api.arboriculture.ITreeMutation; -import forestry.api.arboriculture.TreeManager; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IAlleleInteger; -import forestry.api.genetics.IAlleleSpecies; -import forestry.api.genetics.IBreedingTracker; -import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.IFruitFamily; -import forestry.api.genetics.IIndividual; -import forestry.api.genetics.IMutation; -import forestry.api.genetics.ISpeciesRoot; -import forestry.api.genetics.ISpeciesType; +import forestry.api.arboriculture.*; +import forestry.api.genetics.*; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.TreeSet; +import java.util.*; public class TreeBreedingSystem extends BreedingSystem { public UniqueItemStackSet allFruits; diff --git a/src/main/java/binnie/core/genetics/VirtualBeeHousing.java b/src/main/java/binnie/core/genetics/VirtualBeeHousing.java index 213e58e8..3bba6141 100644 --- a/src/main/java/binnie/core/genetics/VirtualBeeHousing.java +++ b/src/main/java/binnie/core/genetics/VirtualBeeHousing.java @@ -1,13 +1,7 @@ package binnie.core.genetics; import com.mojang.authlib.GameProfile; -import forestry.api.apiculture.IBee; -import forestry.api.apiculture.IBeeGenome; -import forestry.api.apiculture.IBeeHousing; -import forestry.api.apiculture.IBeeHousingInventory; -import forestry.api.apiculture.IBeeListener; -import forestry.api.apiculture.IBeeModifier; -import forestry.api.apiculture.IBeekeepingLogic; +import forestry.api.apiculture.*; import forestry.api.core.IErrorLogic; import forestry.api.genetics.IIndividual; import forestry.apiculture.FakeBeekeepingLogic; diff --git a/src/main/java/binnie/core/integration/extrabees/ExtraBeesIntegration.java b/src/main/java/binnie/core/integration/extrabees/ExtraBeesIntegration.java new file mode 100644 index 00000000..7df2fb96 --- /dev/null +++ b/src/main/java/binnie/core/integration/extrabees/ExtraBeesIntegration.java @@ -0,0 +1,54 @@ +package binnie.core.integration.extrabees; + +import binnie.core.IInitializable; +import com.google.common.base.Preconditions; +import forestry.api.apiculture.IAlleleBeeSpecies; +import forestry.api.genetics.AlleleManager; +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.common.registry.ForgeRegistries; + +/** + * Created by Elec332 on 13-5-2017. + */ +public class ExtraBeesIntegration implements IInitializable { + + private static final boolean loaded; + public static IAlleleBeeSpecies water, rock, basalt; + public static Block hive; + public static Item dictionary; + + @Override + public void preInit() { + + } + + @Override + public void init() { + water = getExtraBeesSpecies("water"); + rock = getExtraBeesSpecies("rock"); + basalt = getExtraBeesSpecies("basalt"); + hive = Preconditions.checkNotNull(ForgeRegistries.BLOCKS.getValue(new ResourceLocation("extrabees", "hive"))); + dictionary = Preconditions.checkNotNull(ForgeRegistries.ITEMS.getValue(new ResourceLocation("extrabees", "dictionary"))); + } + + @Override + public void postInit() { + + } + + private IAlleleBeeSpecies getExtraBeesSpecies(String species){ + return Preconditions.checkNotNull((IAlleleBeeSpecies) AlleleManager.alleleRegistry.getAllele("extrabees.species."+species)); + } + + public static boolean isLoaded(){ + return loaded; + } + + static { + loaded = Loader.isModLoaded("extrabees"); + } + +} diff --git a/src/main/java/binnie/core/item/IItemMiscProvider.java b/src/main/java/binnie/core/item/IItemMiscProvider.java index 61a40540..6fee44bb 100644 --- a/src/main/java/binnie/core/item/IItemMiscProvider.java +++ b/src/main/java/binnie/core/item/IItemMiscProvider.java @@ -1,10 +1,8 @@ package binnie.core.item; -import binnie.extrabees.items.types.IEBEnumItem; - import java.util.List; -public interface IItemMiscProvider extends IEBEnumItem { +public interface IItemMiscProvider extends IItemEnum { void addInformation(List tooltip); diff --git a/src/main/java/binnie/core/liquid/BinnieFluid.java b/src/main/java/binnie/core/liquid/BinnieFluid.java index a3c33509..73603299 100644 --- a/src/main/java/binnie/core/liquid/BinnieFluid.java +++ b/src/main/java/binnie/core/liquid/BinnieFluid.java @@ -3,7 +3,7 @@ package binnie.core.liquid; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; -import java.awt.Color; +import java.awt.*; class BinnieFluid extends Fluid { private final String name; diff --git a/src/main/java/binnie/core/liquid/ItemFluidContainer.java b/src/main/java/binnie/core/liquid/ItemFluidContainer.java index 054759c6..8e05bfaf 100644 --- a/src/main/java/binnie/core/liquid/ItemFluidContainer.java +++ b/src/main/java/binnie/core/liquid/ItemFluidContainer.java @@ -18,12 +18,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ActionResult; -import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumHand; -import net.minecraft.util.NonNullList; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.SoundCategory; +import net.minecraft.util.*; import net.minecraft.world.World; import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.fluids.Fluid; diff --git a/src/main/java/binnie/core/machines/BlockMachine.java b/src/main/java/binnie/core/machines/BlockMachine.java index 58f32986..a106157b 100644 --- a/src/main/java/binnie/core/machines/BlockMachine.java +++ b/src/main/java/binnie/core/machines/BlockMachine.java @@ -15,11 +15,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockRenderLayer; -import net.minecraft.util.EnumBlockRenderType; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.NonNullList; +import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/binnie/core/machines/Machine.java b/src/main/java/binnie/core/machines/Machine.java index cdb02eb8..0a7a4ca7 100644 --- a/src/main/java/binnie/core/machines/Machine.java +++ b/src/main/java/binnie/core/machines/Machine.java @@ -26,11 +26,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; +import java.util.*; public class Machine implements INetworkedEntity, INbtReadable, INbtWritable, INetwork.TilePacketSync, IMachine, INetwork.GuiNBT { private MachinePackage machinePackage; diff --git a/src/main/java/binnie/core/machines/ManagerMachine.java b/src/main/java/binnie/core/machines/ManagerMachine.java index 1db30741..92555652 100644 --- a/src/main/java/binnie/core/machines/ManagerMachine.java +++ b/src/main/java/binnie/core/machines/ManagerMachine.java @@ -7,11 +7,7 @@ import binnie.core.machines.inventory.ValidatorSprite; import forestry.api.core.INbtReadable; import forestry.api.core.INbtWritable; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; +import java.util.*; public class ManagerMachine extends ManagerBase { private Map, Class[]> componentInterfaceMap; diff --git a/src/main/java/binnie/core/machines/base/TileEntityMachineBase.java b/src/main/java/binnie/core/machines/base/TileEntityMachineBase.java index e9233f57..3eda6825 100644 --- a/src/main/java/binnie/core/machines/base/TileEntityMachineBase.java +++ b/src/main/java/binnie/core/machines/base/TileEntityMachineBase.java @@ -3,11 +3,7 @@ package binnie.core.machines.base; import binnie.core.machines.Machine; import binnie.core.machines.inventory.IInventoryMachine; import binnie.core.machines.inventory.TankSlot; -import binnie.core.machines.power.IPoweredMachine; -import binnie.core.machines.power.ITankMachine; -import binnie.core.machines.power.PowerInfo; -import binnie.core.machines.power.PowerInterface; -import binnie.core.machines.power.TankInfo; +import binnie.core.machines.power.*; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java b/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java index 35fd011c..81a30a69 100644 --- a/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java +++ b/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java @@ -15,11 +15,7 @@ import net.minecraftforge.fluids.capability.IFluidTankProperties; import net.minecraftforge.fluids.capability.templates.FluidHandlerConcatenate; import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.EnumMap; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; +import java.util.*; public class ComponentTankContainer extends MachineComponent implements ITankMachine { private Map tanks; diff --git a/src/main/java/binnie/core/machines/inventory/SidedAccess.java b/src/main/java/binnie/core/machines/inventory/SidedAccess.java index 35af77cd..80c84aa1 100644 --- a/src/main/java/binnie/core/machines/inventory/SidedAccess.java +++ b/src/main/java/binnie/core/machines/inventory/SidedAccess.java @@ -2,11 +2,7 @@ package binnie.core.machines.inventory; import net.minecraft.util.EnumFacing; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; class SidedAccess { private Map accesses; diff --git a/src/main/java/binnie/core/machines/storage/WindowCompartment.java b/src/main/java/binnie/core/machines/storage/WindowCompartment.java index 08f12114..703b6925 100644 --- a/src/main/java/binnie/core/machines/storage/WindowCompartment.java +++ b/src/main/java/binnie/core/machines/storage/WindowCompartment.java @@ -23,17 +23,8 @@ import binnie.core.craftgui.geometry.Border; import binnie.core.craftgui.geometry.CraftGUIUtil; import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.geometry.Position; -import binnie.core.craftgui.minecraft.Dialog; -import binnie.core.craftgui.minecraft.EnumColor; -import binnie.core.craftgui.minecraft.IWindowAffectsShiftClick; -import binnie.core.craftgui.minecraft.MinecraftGUI; -import binnie.core.craftgui.minecraft.Window; -import binnie.core.craftgui.minecraft.control.ControlItemDisplay; -import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; -import binnie.core.craftgui.minecraft.control.ControlSlide; -import binnie.core.craftgui.minecraft.control.ControlSlot; -import binnie.core.craftgui.minecraft.control.ControlSlotArray; -import binnie.core.craftgui.minecraft.control.ControlTabIcon; +import binnie.core.craftgui.minecraft.*; +import binnie.core.craftgui.minecraft.control.*; import binnie.core.craftgui.renderer.RenderUtil; import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; @@ -52,12 +43,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; -import java.util.Arrays; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.Map.Entry; public class WindowCompartment extends WindowMachine implements IWindowAffectsShiftClick { diff --git a/src/main/java/binnie/core/mod/config/ManagerConfig.java b/src/main/java/binnie/core/mod/config/ManagerConfig.java index 5ebbb787..8392b72c 100644 --- a/src/main/java/binnie/core/mod/config/ManagerConfig.java +++ b/src/main/java/binnie/core/mod/config/ManagerConfig.java @@ -7,11 +7,7 @@ import net.minecraftforge.common.config.Configuration; import java.lang.annotation.Annotation; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; +import java.util.*; public class ManagerConfig extends ManagerBase { private Map, Configuration> configurations; diff --git a/src/main/java/binnie/core/models/AABBModelBaker.java b/src/main/java/binnie/core/models/AABBModelBaker.java index 07287cca..0c17d487 100644 --- a/src/main/java/binnie/core/models/AABBModelBaker.java +++ b/src/main/java/binnie/core/models/AABBModelBaker.java @@ -8,12 +8,7 @@ import forestry.core.models.baker.ModelBakerModel; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.block.model.BakedQuad; -import net.minecraft.client.renderer.block.model.BlockFaceUV; -import net.minecraft.client.renderer.block.model.BlockPartFace; -import net.minecraft.client.renderer.block.model.FaceBakery; -import net.minecraft.client.renderer.block.model.IBakedModel; -import net.minecraft.client.renderer.block.model.ModelRotation; +import net.minecraft.client.renderer.block.model.*; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; diff --git a/src/main/java/binnie/core/models/ModelManager.java b/src/main/java/binnie/core/models/ModelManager.java index 70089d82..3c93e380 100644 --- a/src/main/java/binnie/core/models/ModelManager.java +++ b/src/main/java/binnie/core/models/ModelManager.java @@ -3,11 +3,7 @@ package binnie.core.models; import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; -import forestry.api.core.ForestryAPI; -import forestry.api.core.IItemModelRegister; -import forestry.api.core.IModelManager; -import forestry.api.core.ISpriteRegister; -import forestry.api.core.IStateMapperRegister; +import forestry.api.core.*; import forestry.core.blocks.IColoredBlock; import forestry.core.items.IColoredItem; import forestry.core.models.BlockModelEntry; diff --git a/src/main/java/binnie/core/network/BinnieCorePacketID.java b/src/main/java/binnie/core/network/BinnieCorePacketID.java index 705cd59b..80021390 100644 --- a/src/main/java/binnie/core/network/BinnieCorePacketID.java +++ b/src/main/java/binnie/core/network/BinnieCorePacketID.java @@ -6,11 +6,7 @@ import binnie.core.craftgui.minecraft.ContainerCraftGUI; import binnie.core.machines.IMachine; import binnie.core.machines.Machine; import binnie.core.machines.network.INetwork; -import binnie.core.network.packet.MessageBinnie; -import binnie.core.network.packet.MessageCraftGUI; -import binnie.core.network.packet.MessageMetadata; -import binnie.core.network.packet.MessageTileNBT; -import binnie.core.network.packet.MessageUpdate; +import binnie.core.network.packet.*; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.network.NetHandlerPlayServer; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/binnie/core/proxy/BinnieProxyClient.java b/src/main/java/binnie/core/proxy/BinnieProxyClient.java index 7f8c985b..cb57e314 100644 --- a/src/main/java/binnie/core/proxy/BinnieProxyClient.java +++ b/src/main/java/binnie/core/proxy/BinnieProxyClient.java @@ -4,7 +4,6 @@ import binnie.Constants; import binnie.core.craftgui.resource.minecraft.CraftGUIResourceManager; import binnie.core.models.ModelManager; import binnie.core.resource.BinnieResource; - import com.google.common.base.Throwables; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; diff --git a/src/main/java/binnie/core/util/FakeCraftingWorld.java b/src/main/java/binnie/core/util/FakeCraftingWorld.java index b6064aaf..633b7b5e 100644 --- a/src/main/java/binnie/core/util/FakeCraftingWorld.java +++ b/src/main/java/binnie/core/util/FakeCraftingWorld.java @@ -4,12 +4,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.profiler.Profiler; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.DimensionType; -import net.minecraft.world.GameType; -import net.minecraft.world.World; -import net.minecraft.world.WorldProvider; -import net.minecraft.world.WorldSettings; -import net.minecraft.world.WorldType; +import net.minecraft.world.*; import net.minecraft.world.chunk.IChunkProvider; import net.minecraft.world.storage.ISaveHandler; import net.minecraft.world.storage.WorldInfo; diff --git a/src/main/java/binnie/core/util/FluidStackSet.java b/src/main/java/binnie/core/util/FluidStackSet.java index 1d899726..b23a2cef 100644 --- a/src/main/java/binnie/core/util/FluidStackSet.java +++ b/src/main/java/binnie/core/util/FluidStackSet.java @@ -3,11 +3,7 @@ package binnie.core.util; import net.minecraftforge.fluids.FluidStack; import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Iterator; -import java.util.List; -import java.util.Set; +import java.util.*; class FluidStackSet implements Set { protected final List fluidStacks; diff --git a/src/main/java/binnie/core/util/ItemStackSet.java b/src/main/java/binnie/core/util/ItemStackSet.java index 7198fed0..55d7ae74 100644 --- a/src/main/java/binnie/core/util/ItemStackSet.java +++ b/src/main/java/binnie/core/util/ItemStackSet.java @@ -2,11 +2,7 @@ package binnie.core.util; import net.minecraft.item.ItemStack; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Iterator; -import java.util.List; -import java.util.Set; +import java.util.*; public class ItemStackSet implements Set { List itemStacks; diff --git a/src/main/java/binnie/extrabees/ExtraBees.java b/src/main/java/binnie/extrabees/ExtraBees.java index fad123e9..1aa12791 100644 --- a/src/main/java/binnie/extrabees/ExtraBees.java +++ b/src/main/java/binnie/extrabees/ExtraBees.java @@ -1,7 +1,5 @@ package binnie.extrabees; -import binnie.Constants; -import binnie.core.gui.BinnieGUIHandler; import binnie.extrabees.client.GuiHack; import binnie.extrabees.genetics.ExtraBeeMutation; import binnie.extrabees.genetics.ExtraBeesBranch; @@ -26,11 +24,10 @@ import net.minecraftforge.fml.common.SidedProxy; import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import net.minecraftforge.fml.common.network.NetworkRegistry; import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; import net.minecraftforge.fml.common.registry.GameRegistry; -@Mod(modid = ExtraBees.MODID, name = "Binnie's Extra Bees", useMetadata = true, dependencies = "required-after:" + Constants.CORE_MOD_ID) +@Mod(modid = ExtraBees.MODID, name = "Binnie's Extra Bees", useMetadata = true) public class ExtraBees { public static final String MODID = "extrabees"; @@ -75,7 +72,6 @@ public class ExtraBees { @Mod.EventHandler public void init(final FMLInitializationEvent evt) { GuiHack.INSTANCE.init(); - NetworkRegistry.INSTANCE.registerGuiHandler(instance, new BinnieGUIHandler(GuiHack.INSTANCE)); configHandler.reload(true); ItemHoneyComb.addSubtypes(); diff --git a/src/main/java/binnie/extrabees/apiary/ComponentExtraBeeGUI.java b/src/main/java/binnie/extrabees/apiary/ComponentExtraBeeGUI.java index 4bf5478c..e2a1ddd1 100644 --- a/src/main/java/binnie/extrabees/apiary/ComponentExtraBeeGUI.java +++ b/src/main/java/binnie/extrabees/apiary/ComponentExtraBeeGUI.java @@ -3,9 +3,8 @@ package binnie.extrabees.apiary; import binnie.core.machines.Machine; import binnie.core.machines.MachineComponent; import binnie.core.machines.component.IInteraction; -import binnie.extrabees.ExtraBees; import binnie.extrabees.client.GuiHack; -import binnie.extrabees.core.ExtraBeeGUID; +import binnie.extrabees.client.ExtraBeeGUID; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/binnie/extrabees/apiary/machine/AlvearyFrame.java b/src/main/java/binnie/extrabees/apiary/machine/AlvearyFrame.java index 138a3d86..8be32054 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/AlvearyFrame.java +++ b/src/main/java/binnie/extrabees/apiary/machine/AlvearyFrame.java @@ -7,8 +7,8 @@ import binnie.core.machines.inventory.SlotValidator; import binnie.extrabees.apiary.ComponentBeeModifier; import binnie.extrabees.apiary.ComponentExtraBeeGUI; import binnie.extrabees.apiary.TileExtraBeeAlveary; -import binnie.extrabees.core.ExtraBeeGUID; -import binnie.extrabees.core.ExtraBeeTexture; +import binnie.extrabees.client.ExtraBeeGUID; +import binnie.extrabees.client.ExtraBeeTexture; import binnie.extrabees.utils.Utils; import forestry.api.apiculture.*; import forestry.api.multiblock.IAlvearyController; diff --git a/src/main/java/binnie/extrabees/apiary/machine/AlvearyHatchery.java b/src/main/java/binnie/extrabees/apiary/machine/AlvearyHatchery.java index c73df85f..a91232bf 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/AlvearyHatchery.java +++ b/src/main/java/binnie/extrabees/apiary/machine/AlvearyHatchery.java @@ -9,8 +9,8 @@ import binnie.core.machines.transfer.TransferRequest; import binnie.extrabees.apiary.ComponentBeeModifier; import binnie.extrabees.apiary.ComponentExtraBeeGUI; import binnie.extrabees.apiary.TileExtraBeeAlveary; -import binnie.extrabees.core.ExtraBeeGUID; -import binnie.extrabees.core.ExtraBeeTexture; +import binnie.extrabees.client.ExtraBeeGUID; +import binnie.extrabees.client.ExtraBeeTexture; import binnie.extrabees.utils.Utils; import forestry.api.apiculture.*; import net.minecraft.item.ItemStack; diff --git a/src/main/java/binnie/extrabees/apiary/machine/AlvearyLighting.java b/src/main/java/binnie/extrabees/apiary/machine/AlvearyLighting.java index a8905353..acd68d9a 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/AlvearyLighting.java +++ b/src/main/java/binnie/extrabees/apiary/machine/AlvearyLighting.java @@ -3,7 +3,7 @@ package binnie.extrabees.apiary.machine; import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.extrabees.apiary.ComponentBeeModifier; -import binnie.extrabees.core.ExtraBeeTexture; +import binnie.extrabees.client.ExtraBeeTexture; import forestry.api.apiculture.IBeeListener; import forestry.api.apiculture.IBeeModifier; diff --git a/src/main/java/binnie/extrabees/apiary/machine/AlvearyMutator.java b/src/main/java/binnie/extrabees/apiary/machine/AlvearyMutator.java index 00aa893d..84081b5a 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/AlvearyMutator.java +++ b/src/main/java/binnie/extrabees/apiary/machine/AlvearyMutator.java @@ -7,8 +7,8 @@ import binnie.core.machines.inventory.SlotValidator; import binnie.extrabees.apiary.ComponentBeeModifier; import binnie.extrabees.apiary.ComponentExtraBeeGUI; import binnie.extrabees.apiary.ModuleApiary; -import binnie.extrabees.core.ExtraBeeGUID; -import binnie.extrabees.core.ExtraBeeTexture; +import binnie.extrabees.client.ExtraBeeGUID; +import binnie.extrabees.client.ExtraBeeTexture; import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeListener; diff --git a/src/main/java/binnie/extrabees/apiary/machine/AlvearyRainShield.java b/src/main/java/binnie/extrabees/apiary/machine/AlvearyRainShield.java index fcd9cdcc..173acf41 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/AlvearyRainShield.java +++ b/src/main/java/binnie/extrabees/apiary/machine/AlvearyRainShield.java @@ -3,7 +3,7 @@ package binnie.extrabees.apiary.machine; import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.extrabees.apiary.ComponentBeeModifier; -import binnie.extrabees.core.ExtraBeeTexture; +import binnie.extrabees.client.ExtraBeeTexture; import forestry.api.apiculture.IBeeListener; import forestry.api.apiculture.IBeeModifier; diff --git a/src/main/java/binnie/extrabees/apiary/machine/AlvearyStimulator.java b/src/main/java/binnie/extrabees/apiary/machine/AlvearyStimulator.java index b5a5bbf8..79fe6453 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/AlvearyStimulator.java +++ b/src/main/java/binnie/extrabees/apiary/machine/AlvearyStimulator.java @@ -9,8 +9,8 @@ import binnie.core.machines.inventory.SlotValidator; import binnie.core.machines.power.ComponentPowerReceptor; import binnie.extrabees.apiary.ComponentBeeModifier; import binnie.extrabees.apiary.ComponentExtraBeeGUI; -import binnie.extrabees.core.ExtraBeeGUID; -import binnie.extrabees.core.ExtraBeeTexture; +import binnie.extrabees.client.ExtraBeeGUID; +import binnie.extrabees.client.ExtraBeeTexture; import binnie.extrabees.utils.BeeModifierLogic; import binnie.extrabees.utils.EnumBeeBooleanModifier; import binnie.extrabees.utils.EnumBeeModifier; diff --git a/src/main/java/binnie/extrabees/apiary/machine/AlvearyTransmission.java b/src/main/java/binnie/extrabees/apiary/machine/AlvearyTransmission.java index d7f8eade..7c73c193 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/AlvearyTransmission.java +++ b/src/main/java/binnie/extrabees/apiary/machine/AlvearyTransmission.java @@ -6,7 +6,7 @@ import binnie.core.machines.Machine; import binnie.core.machines.power.ComponentPowerReceptor; import binnie.extrabees.apiary.ComponentBeeModifier; import binnie.extrabees.apiary.TileExtraBeeAlveary; -import binnie.extrabees.core.ExtraBeeTexture; +import binnie.extrabees.client.ExtraBeeTexture; import forestry.api.apiculture.IBeeListener; import forestry.api.apiculture.IBeeModifier; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/binnie/extrabees/core/BeeModelProvider.java b/src/main/java/binnie/extrabees/client/BeeModelProvider.java similarity index 98% rename from src/main/java/binnie/extrabees/core/BeeModelProvider.java rename to src/main/java/binnie/extrabees/client/BeeModelProvider.java index 2a640f87..c656ca91 100644 --- a/src/main/java/binnie/extrabees/core/BeeModelProvider.java +++ b/src/main/java/binnie/extrabees/client/BeeModelProvider.java @@ -1,4 +1,4 @@ -package binnie.extrabees.core; +package binnie.extrabees.client; import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.EnumBeeType; diff --git a/src/main/java/binnie/extrabees/core/ExtraBeeGUID.java b/src/main/java/binnie/extrabees/client/ExtraBeeGUID.java similarity index 82% rename from src/main/java/binnie/extrabees/core/ExtraBeeGUID.java rename to src/main/java/binnie/extrabees/client/ExtraBeeGUID.java index d939b03e..883f554e 100644 --- a/src/main/java/binnie/extrabees/core/ExtraBeeGUID.java +++ b/src/main/java/binnie/extrabees/client/ExtraBeeGUID.java @@ -1,12 +1,12 @@ -package binnie.extrabees.core; +package binnie.extrabees.client; import binnie.core.craftgui.minecraft.Window; import binnie.core.gui.IBinnieGUID; -import binnie.extrabees.gui.WindowAlvearyFrame; -import binnie.extrabees.gui.WindowAlvearyHatchery; -import binnie.extrabees.gui.WindowAlvearyMutator; -import binnie.extrabees.gui.WindowAlvearyStimulator; -import binnie.extrabees.gui.database.WindowApiaristDatabase; +import binnie.extrabees.client.gui.WindowAlvearyFrame; +import binnie.extrabees.client.gui.WindowAlvearyHatchery; +import binnie.extrabees.client.gui.WindowAlvearyMutator; +import binnie.extrabees.client.gui.WindowAlvearyStimulator; +import binnie.extrabees.client.gui.database.WindowApiaristDatabase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/binnie/extrabees/core/ExtraBeeTexture.java b/src/main/java/binnie/extrabees/client/ExtraBeeTexture.java similarity index 95% rename from src/main/java/binnie/extrabees/core/ExtraBeeTexture.java rename to src/main/java/binnie/extrabees/client/ExtraBeeTexture.java index 4a9ef2bc..c756d90e 100644 --- a/src/main/java/binnie/extrabees/core/ExtraBeeTexture.java +++ b/src/main/java/binnie/extrabees/client/ExtraBeeTexture.java @@ -1,10 +1,9 @@ -package binnie.extrabees.core; +package binnie.extrabees.client; import binnie.Binnie; import binnie.core.resource.BinnieResource; import binnie.core.resource.IBinnieTexture; import binnie.core.resource.ResourceType; -import binnie.extrabees.ExtraBees; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/extrabees/client/GuiHack.java b/src/main/java/binnie/extrabees/client/GuiHack.java index c6b43e97..d7dd617d 100644 --- a/src/main/java/binnie/extrabees/client/GuiHack.java +++ b/src/main/java/binnie/extrabees/client/GuiHack.java @@ -7,13 +7,12 @@ import binnie.core.network.BinniePacketHandler; import binnie.core.proxy.IProxyCore; import binnie.extrabees.ExtraBees; import binnie.extrabees.apiary.ModuleApiary; -import binnie.extrabees.core.ExtraBeeGUID; -import binnie.extrabees.core.ModuleCore; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.util.math.BlockPos; +import net.minecraftforge.fml.common.network.NetworkRegistry; import javax.annotation.Nonnull; @@ -64,7 +63,7 @@ public class GuiHack extends AbstractMod { @Override public void init() { - + NetworkRegistry.INSTANCE.registerGuiHandler(ExtraBees.instance, new binnie.core.gui.BinnieGUIHandler(GuiHack.INSTANCE)); } @Override @@ -83,7 +82,6 @@ public class GuiHack extends AbstractMod { @Override protected void registerModules() { - addModule(new ModuleCore()); addModule(new ModuleApiary()); } diff --git a/src/main/java/binnie/extrabees/gui/WindowAlvearyFrame.java b/src/main/java/binnie/extrabees/client/gui/WindowAlvearyFrame.java similarity index 94% rename from src/main/java/binnie/extrabees/gui/WindowAlvearyFrame.java rename to src/main/java/binnie/extrabees/client/gui/WindowAlvearyFrame.java index c428e00f..3ad501ff 100644 --- a/src/main/java/binnie/extrabees/gui/WindowAlvearyFrame.java +++ b/src/main/java/binnie/extrabees/client/gui/WindowAlvearyFrame.java @@ -1,10 +1,9 @@ -package binnie.extrabees.gui; +package binnie.extrabees.client.gui; import binnie.core.AbstractMod; import binnie.core.craftgui.minecraft.Window; import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; import binnie.core.craftgui.minecraft.control.ControlSlot; -import binnie.extrabees.ExtraBees; import binnie.extrabees.client.GuiHack; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/binnie/extrabees/gui/WindowAlvearyHatchery.java b/src/main/java/binnie/extrabees/client/gui/WindowAlvearyHatchery.java similarity index 97% rename from src/main/java/binnie/extrabees/gui/WindowAlvearyHatchery.java rename to src/main/java/binnie/extrabees/client/gui/WindowAlvearyHatchery.java index 90cfb27b..db16c47e 100644 --- a/src/main/java/binnie/extrabees/gui/WindowAlvearyHatchery.java +++ b/src/main/java/binnie/extrabees/client/gui/WindowAlvearyHatchery.java @@ -1,4 +1,4 @@ -package binnie.extrabees.gui; +package binnie.extrabees.client.gui; import binnie.core.AbstractMod; import binnie.core.craftgui.minecraft.Window; diff --git a/src/main/java/binnie/extrabees/gui/WindowAlvearyIndustrialFrame.java b/src/main/java/binnie/extrabees/client/gui/WindowAlvearyIndustrialFrame.java similarity index 96% rename from src/main/java/binnie/extrabees/gui/WindowAlvearyIndustrialFrame.java rename to src/main/java/binnie/extrabees/client/gui/WindowAlvearyIndustrialFrame.java index e3a6e05e..5d3768e6 100644 --- a/src/main/java/binnie/extrabees/gui/WindowAlvearyIndustrialFrame.java +++ b/src/main/java/binnie/extrabees/client/gui/WindowAlvearyIndustrialFrame.java @@ -1,4 +1,4 @@ -package binnie.extrabees.gui; +package binnie.extrabees.client.gui; import binnie.core.AbstractMod; import binnie.core.craftgui.minecraft.Window; diff --git a/src/main/java/binnie/extrabees/gui/WindowAlvearyMutator.java b/src/main/java/binnie/extrabees/client/gui/WindowAlvearyMutator.java similarity index 97% rename from src/main/java/binnie/extrabees/gui/WindowAlvearyMutator.java rename to src/main/java/binnie/extrabees/client/gui/WindowAlvearyMutator.java index 6688702c..8e28fb0d 100644 --- a/src/main/java/binnie/extrabees/gui/WindowAlvearyMutator.java +++ b/src/main/java/binnie/extrabees/client/gui/WindowAlvearyMutator.java @@ -1,4 +1,4 @@ -package binnie.extrabees.gui; +package binnie.extrabees.client.gui; import binnie.core.AbstractMod; import binnie.core.craftgui.controls.ControlText; @@ -8,7 +8,6 @@ import binnie.core.craftgui.minecraft.Window; import binnie.core.craftgui.minecraft.control.ControlItemDisplay; import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; import binnie.core.craftgui.minecraft.control.ControlSlot; -import binnie.extrabees.ExtraBees; import binnie.extrabees.apiary.machine.AlvearyMutator; import binnie.extrabees.client.GuiHack; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/binnie/extrabees/gui/WindowAlvearyStimulator.java b/src/main/java/binnie/extrabees/client/gui/WindowAlvearyStimulator.java similarity index 95% rename from src/main/java/binnie/extrabees/gui/WindowAlvearyStimulator.java rename to src/main/java/binnie/extrabees/client/gui/WindowAlvearyStimulator.java index 47009c80..f891ec52 100644 --- a/src/main/java/binnie/extrabees/gui/WindowAlvearyStimulator.java +++ b/src/main/java/binnie/extrabees/client/gui/WindowAlvearyStimulator.java @@ -1,4 +1,4 @@ -package binnie.extrabees.gui; +package binnie.extrabees.client.gui; import binnie.core.AbstractMod; import binnie.core.craftgui.geometry.Position; @@ -6,7 +6,6 @@ import binnie.core.craftgui.minecraft.Window; import binnie.core.craftgui.minecraft.control.ControlEnergyBar; import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; import binnie.core.craftgui.minecraft.control.ControlSlot; -import binnie.extrabees.ExtraBees; import binnie.extrabees.apiary.machine.AlvearyStimulator; import binnie.extrabees.client.GuiHack; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/binnie/extrabees/gui/database/ControlBiomes.java b/src/main/java/binnie/extrabees/client/gui/database/ControlBiomes.java similarity index 97% rename from src/main/java/binnie/extrabees/gui/database/ControlBiomes.java rename to src/main/java/binnie/extrabees/client/gui/database/ControlBiomes.java index 2759b81f..ed24cd94 100644 --- a/src/main/java/binnie/extrabees/gui/database/ControlBiomes.java +++ b/src/main/java/binnie/extrabees/client/gui/database/ControlBiomes.java @@ -1,4 +1,4 @@ -package binnie.extrabees.gui.database; +package binnie.extrabees.client.gui.database; import binnie.Binnie; import binnie.core.craftgui.*; diff --git a/src/main/java/binnie/extrabees/gui/database/ControlClimateBar.java b/src/main/java/binnie/extrabees/client/gui/database/ControlClimateBar.java similarity index 98% rename from src/main/java/binnie/extrabees/gui/database/ControlClimateBar.java rename to src/main/java/binnie/extrabees/client/gui/database/ControlClimateBar.java index 41b5c58e..9f496685 100644 --- a/src/main/java/binnie/extrabees/gui/database/ControlClimateBar.java +++ b/src/main/java/binnie/extrabees/client/gui/database/ControlClimateBar.java @@ -1,4 +1,4 @@ -package binnie.extrabees.gui.database; +package binnie.extrabees.client.gui.database; import binnie.Binnie; import binnie.core.craftgui.*; diff --git a/src/main/java/binnie/extrabees/gui/database/ControlProductsBox.java b/src/main/java/binnie/extrabees/client/gui/database/ControlProductsBox.java similarity index 97% rename from src/main/java/binnie/extrabees/gui/database/ControlProductsBox.java rename to src/main/java/binnie/extrabees/client/gui/database/ControlProductsBox.java index f15ca2b6..9d104fa4 100644 --- a/src/main/java/binnie/extrabees/gui/database/ControlProductsBox.java +++ b/src/main/java/binnie/extrabees/client/gui/database/ControlProductsBox.java @@ -1,4 +1,4 @@ -package binnie.extrabees.gui.database; +package binnie.extrabees.client.gui.database; import binnie.Binnie; import binnie.core.BinnieCore; diff --git a/src/main/java/binnie/extrabees/gui/database/ControlProductsItem.java b/src/main/java/binnie/extrabees/client/gui/database/ControlProductsItem.java similarity index 96% rename from src/main/java/binnie/extrabees/gui/database/ControlProductsItem.java rename to src/main/java/binnie/extrabees/client/gui/database/ControlProductsItem.java index ae5c815b..8f466f29 100644 --- a/src/main/java/binnie/extrabees/gui/database/ControlProductsItem.java +++ b/src/main/java/binnie/extrabees/client/gui/database/ControlProductsItem.java @@ -1,4 +1,4 @@ -package binnie.extrabees.gui.database; +package binnie.extrabees.client.gui.database; import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.controls.ControlTextCentered; diff --git a/src/main/java/binnie/extrabees/gui/database/PageSpeciesClimate.java b/src/main/java/binnie/extrabees/client/gui/database/PageSpeciesClimate.java similarity index 95% rename from src/main/java/binnie/extrabees/gui/database/PageSpeciesClimate.java rename to src/main/java/binnie/extrabees/client/gui/database/PageSpeciesClimate.java index cbda0298..42d973ae 100644 --- a/src/main/java/binnie/extrabees/gui/database/PageSpeciesClimate.java +++ b/src/main/java/binnie/extrabees/client/gui/database/PageSpeciesClimate.java @@ -1,4 +1,4 @@ -package binnie.extrabees.gui.database; +package binnie.extrabees.client.gui.database; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlTextCentered; diff --git a/src/main/java/binnie/extrabees/gui/database/PageSpeciesGenome.java b/src/main/java/binnie/extrabees/client/gui/database/PageSpeciesGenome.java similarity index 99% rename from src/main/java/binnie/extrabees/gui/database/PageSpeciesGenome.java rename to src/main/java/binnie/extrabees/client/gui/database/PageSpeciesGenome.java index 57c960d6..cab9b992 100644 --- a/src/main/java/binnie/extrabees/gui/database/PageSpeciesGenome.java +++ b/src/main/java/binnie/extrabees/client/gui/database/PageSpeciesGenome.java @@ -1,4 +1,4 @@ -package binnie.extrabees.gui.database; +package binnie.extrabees.client.gui.database; import binnie.Binnie; import binnie.core.craftgui.IWidget; diff --git a/src/main/java/binnie/extrabees/gui/database/PageSpeciesProducts.java b/src/main/java/binnie/extrabees/client/gui/database/PageSpeciesProducts.java similarity index 96% rename from src/main/java/binnie/extrabees/gui/database/PageSpeciesProducts.java rename to src/main/java/binnie/extrabees/client/gui/database/PageSpeciesProducts.java index 099d1c0d..94825728 100644 --- a/src/main/java/binnie/extrabees/gui/database/PageSpeciesProducts.java +++ b/src/main/java/binnie/extrabees/client/gui/database/PageSpeciesProducts.java @@ -1,4 +1,4 @@ -package binnie.extrabees.gui.database; +package binnie.extrabees.client.gui.database; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlText; diff --git a/src/main/java/binnie/extrabees/gui/database/WindowApiaristDatabase.java b/src/main/java/binnie/extrabees/client/gui/database/WindowApiaristDatabase.java similarity index 97% rename from src/main/java/binnie/extrabees/gui/database/WindowApiaristDatabase.java rename to src/main/java/binnie/extrabees/client/gui/database/WindowApiaristDatabase.java index 5206c2eb..551de4de 100644 --- a/src/main/java/binnie/extrabees/gui/database/WindowApiaristDatabase.java +++ b/src/main/java/binnie/extrabees/client/gui/database/WindowApiaristDatabase.java @@ -1,10 +1,9 @@ -package binnie.extrabees.gui.database; +package binnie.extrabees.client.gui.database; import binnie.Binnie; import binnie.core.AbstractMod; import binnie.core.craftgui.database.*; import binnie.core.craftgui.minecraft.Window; -import binnie.extrabees.ExtraBees; import binnie.extrabees.client.GuiHack; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/binnie/extrabees/core/package-info.java b/src/main/java/binnie/extrabees/client/gui/database/package-info.java similarity index 83% rename from src/main/java/binnie/extrabees/core/package-info.java rename to src/main/java/binnie/extrabees/client/gui/database/package-info.java index 83119bdd..183d6c4a 100644 --- a/src/main/java/binnie/extrabees/core/package-info.java +++ b/src/main/java/binnie/extrabees/client/gui/database/package-info.java @@ -1,7 +1,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault @FieldsAreNonnullByDefault -package binnie.extrabees.core; +package binnie.extrabees.client.gui.database; import binnie.core.util.FieldsAreNonnullByDefault; import mcp.MethodsReturnNonnullByDefault; diff --git a/src/main/java/binnie/extrabees/gui/package-info.java b/src/main/java/binnie/extrabees/client/gui/package-info.java similarity index 86% rename from src/main/java/binnie/extrabees/gui/package-info.java rename to src/main/java/binnie/extrabees/client/gui/package-info.java index 538f5f6b..7c46779d 100644 --- a/src/main/java/binnie/extrabees/gui/package-info.java +++ b/src/main/java/binnie/extrabees/client/gui/package-info.java @@ -1,7 +1,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault @FieldsAreNonnullByDefault -package binnie.extrabees.gui; +package binnie.extrabees.client.gui; import binnie.core.util.FieldsAreNonnullByDefault; import mcp.MethodsReturnNonnullByDefault; diff --git a/src/main/java/binnie/extrabees/gui/punnett/ControlChromosome.java b/src/main/java/binnie/extrabees/client/gui/punnett/ControlChromosome.java similarity index 96% rename from src/main/java/binnie/extrabees/gui/punnett/ControlChromosome.java rename to src/main/java/binnie/extrabees/client/gui/punnett/ControlChromosome.java index 2122e79e..0a286a89 100644 --- a/src/main/java/binnie/extrabees/gui/punnett/ControlChromosome.java +++ b/src/main/java/binnie/extrabees/client/gui/punnett/ControlChromosome.java @@ -1,4 +1,4 @@ -package binnie.extrabees.gui.punnett; +package binnie.extrabees.client.gui.punnett; import binnie.core.craftgui.*; import binnie.core.craftgui.controls.core.Control; diff --git a/src/main/java/binnie/extrabees/gui/punnett/ControlPunnett.java b/src/main/java/binnie/extrabees/client/gui/punnett/ControlPunnett.java similarity index 98% rename from src/main/java/binnie/extrabees/gui/punnett/ControlPunnett.java rename to src/main/java/binnie/extrabees/client/gui/punnett/ControlPunnett.java index 6a1a8114..e1cb8f32 100644 --- a/src/main/java/binnie/extrabees/gui/punnett/ControlPunnett.java +++ b/src/main/java/binnie/extrabees/client/gui/punnett/ControlPunnett.java @@ -1,4 +1,4 @@ -package binnie.extrabees.gui.punnett; +package binnie.extrabees.client.gui.punnett; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlText; diff --git a/src/main/java/binnie/extrabees/gui/punnett/ExtraBeeGUITexture.java b/src/main/java/binnie/extrabees/client/gui/punnett/ExtraBeeGUITexture.java similarity index 58% rename from src/main/java/binnie/extrabees/gui/punnett/ExtraBeeGUITexture.java rename to src/main/java/binnie/extrabees/client/gui/punnett/ExtraBeeGUITexture.java index 20bceda3..ccbe8af8 100644 --- a/src/main/java/binnie/extrabees/gui/punnett/ExtraBeeGUITexture.java +++ b/src/main/java/binnie/extrabees/client/gui/punnett/ExtraBeeGUITexture.java @@ -1,4 +1,4 @@ -package binnie.extrabees.gui.punnett; +package binnie.extrabees.client.gui.punnett; public enum ExtraBeeGUITexture { Chromosome, diff --git a/src/main/java/binnie/extrabees/gui/punnett/WindowPunnettSquare.java b/src/main/java/binnie/extrabees/client/gui/punnett/WindowPunnettSquare.java similarity index 94% rename from src/main/java/binnie/extrabees/gui/punnett/WindowPunnettSquare.java rename to src/main/java/binnie/extrabees/client/gui/punnett/WindowPunnettSquare.java index 9583e8cd..b54f111e 100644 --- a/src/main/java/binnie/extrabees/gui/punnett/WindowPunnettSquare.java +++ b/src/main/java/binnie/extrabees/client/gui/punnett/WindowPunnettSquare.java @@ -1,4 +1,4 @@ -package binnie.extrabees.gui.punnett; +package binnie.extrabees.client.gui.punnett; import binnie.core.AbstractMod; import binnie.core.craftgui.CraftGUI; @@ -8,9 +8,8 @@ import binnie.core.craftgui.resource.StyleSheet; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import binnie.core.craftgui.resource.minecraft.PaddedTexture; import binnie.core.craftgui.resource.minecraft.StandardTexture; -import binnie.extrabees.ExtraBees; import binnie.extrabees.client.GuiHack; -import binnie.extrabees.core.ExtraBeeTexture; +import binnie.extrabees.client.ExtraBeeTexture; import forestry.api.genetics.ISpeciesRoot; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/binnie/extrabees/gui/punnett/package-info.java b/src/main/java/binnie/extrabees/client/gui/punnett/package-info.java similarity index 84% rename from src/main/java/binnie/extrabees/gui/punnett/package-info.java rename to src/main/java/binnie/extrabees/client/gui/punnett/package-info.java index 3915f845..a6ddb972 100644 --- a/src/main/java/binnie/extrabees/gui/punnett/package-info.java +++ b/src/main/java/binnie/extrabees/client/gui/punnett/package-info.java @@ -1,7 +1,7 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault @FieldsAreNonnullByDefault -package binnie.extrabees.gui.punnett; +package binnie.extrabees.client.gui.punnett; import binnie.core.util.FieldsAreNonnullByDefault; import mcp.MethodsReturnNonnullByDefault; diff --git a/src/main/java/binnie/extrabees/core/ModuleCore.java b/src/main/java/binnie/extrabees/core/ModuleCore.java deleted file mode 100644 index 810a3705..00000000 --- a/src/main/java/binnie/extrabees/core/ModuleCore.java +++ /dev/null @@ -1,24 +0,0 @@ -package binnie.extrabees.core; - -import binnie.core.IInitializable; -import binnie.core.item.ItemMisc; -import binnie.extrabees.ExtraBees; -import forestry.api.core.Tabs; - -public class ModuleCore implements IInitializable { - @Override - public void preInit() { - ExtraBees.itemMisc = new ItemMisc(Tabs.tabApiculture, ExtraBeeItems.values()); - ExtraBees.proxy.registerItem(ExtraBees.itemMisc); - } - - @Override - public void init() { - ExtraBeeItems.init(); - } - - @Override - public void postInit() { - ExtraBeeItems.postInit(); - } -} diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeesSpecies.java b/src/main/java/binnie/extrabees/genetics/ExtraBeesSpecies.java index b5d600db..ce0e769a 100644 --- a/src/main/java/binnie/extrabees/genetics/ExtraBeesSpecies.java +++ b/src/main/java/binnie/extrabees/genetics/ExtraBeesSpecies.java @@ -1,7 +1,7 @@ package binnie.extrabees.genetics; import binnie.extrabees.ExtraBees; -import binnie.extrabees.core.BeeModelProvider; +import binnie.extrabees.client.BeeModelProvider; import binnie.extrabees.genetics.effect.ExtraBeesEffect; import binnie.extrabees.items.ItemHoneyComb; import binnie.extrabees.items.types.EnumHoneyComb; diff --git a/src/main/java/binnie/extrabees/gui/database/package-info.java b/src/main/java/binnie/extrabees/gui/database/package-info.java deleted file mode 100644 index fc98b4c5..00000000 --- a/src/main/java/binnie/extrabees/gui/database/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -@FieldsAreNonnullByDefault -package binnie.extrabees.gui.database; - -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extrabees/init/BlockRegister.java b/src/main/java/binnie/extrabees/init/BlockRegister.java index 1b5d271f..e46c9d6b 100644 --- a/src/main/java/binnie/extrabees/init/BlockRegister.java +++ b/src/main/java/binnie/extrabees/init/BlockRegister.java @@ -31,9 +31,10 @@ public final class BlockRegister { GameRegistry.register(ExtraBees.ectoplasm = new BlockEctoplasm()); } + @SuppressWarnings("all") private static void registerHives(){ GameRegistry.register(ExtraBees.hive = new BlockExtraBeeHive()); - GameRegistry.register(new ItemBeehive(ExtraBees.hive).setRegistryName("hive")); + GameRegistry.register(new ItemBeehive(ExtraBees.hive)); } private static void registerHiveDrops(){ diff --git a/src/main/java/binnie/extrabees/init/ItemRegister.java b/src/main/java/binnie/extrabees/init/ItemRegister.java index 52f017cc..da4b87f7 100644 --- a/src/main/java/binnie/extrabees/init/ItemRegister.java +++ b/src/main/java/binnie/extrabees/init/ItemRegister.java @@ -3,6 +3,8 @@ package binnie.extrabees.init; import binnie.extrabees.ExtraBees; import binnie.extrabees.items.*; import binnie.extrabees.items.types.EnumHoneyComb; +import binnie.extrabees.items.types.ExtraBeeItems; +import forestry.api.core.Tabs; import net.minecraft.init.Items; import net.minecraft.item.ItemBlock; import net.minecraftforge.fml.common.registry.GameRegistry; @@ -16,12 +18,14 @@ public final class ItemRegister { public static void preInitItems(){ registerProducts(); registerMisc(); + registerOreDict(); } @SuppressWarnings("all") private static void registerMisc(){ ExtraBees.proxy.registerItem(ExtraBees.dictionary = new ItemDictionary()); GameRegistry.register(new ItemBlock(ExtraBees.ectoplasm).setRegistryName(ExtraBees.ectoplasm.getRegistryName())); + ExtraBees.itemMisc = ExtraBees.proxy.registerItem(new ItemMiscProduct(Tabs.tabApiculture, ExtraBeeItems.values())); } private static void registerProducts(){ @@ -39,14 +43,26 @@ public final class ItemRegister { ExtraBees.proxy.registerModel(ExtraBees.honeyCrystal, 0); ExtraBees.proxy.registerModel(ExtraBees.honeyCrystalEmpty, 0); for (EnumHoneyComb c : EnumHoneyComb.values()) { - if (c.isActive()) + if (c.isActive()) { ExtraBees.proxy.registerModel(ExtraBees.comb, c.ordinal()); + } } + } - + private static void registerOreDict(){ OreDictionary.registerOre("ingotIron", Items.IRON_INGOT); OreDictionary.registerOre("ingotGold", Items.GOLD_INGOT); OreDictionary.registerOre("gemDiamond", Items.DIAMOND); + + OreDictionary.registerOre("dyeRed", ExtraBeeItems.RedDye.get(1)); + OreDictionary.registerOre("dyeYellow", ExtraBeeItems.YellowDye.get(1)); + OreDictionary.registerOre("dyeBlue", ExtraBeeItems.BlueDye.get(1)); + OreDictionary.registerOre("dyeGreen", ExtraBeeItems.GreenDye.get(1)); + OreDictionary.registerOre("dyeBlack", ExtraBeeItems.BlackDye.get(1)); + OreDictionary.registerOre("dyeWhite", ExtraBeeItems.WhiteDye.get(1)); + OreDictionary.registerOre("dyeBrown", ExtraBeeItems.BrownDye.get(1)); + + OreDictionary.registerOre("gearWood", ExtraBeeItems.ScentedGear.get(1)); } } diff --git a/src/main/java/binnie/extrabees/init/RecipeRegister.java b/src/main/java/binnie/extrabees/init/RecipeRegister.java index 6fdd1fd6..d3937821 100644 --- a/src/main/java/binnie/extrabees/init/RecipeRegister.java +++ b/src/main/java/binnie/extrabees/init/RecipeRegister.java @@ -4,13 +4,18 @@ import binnie.extrabees.ExtraBees; import binnie.extrabees.items.types.EnumHoneyComb; import binnie.extrabees.items.types.EnumHoneyDrop; import binnie.extrabees.items.types.EnumPropolis; +import binnie.extrabees.items.types.ExtraBeeItems; import binnie.extrabees.utils.Utils; import forestry.api.recipes.RecipeManagers; import forestry.apiculture.PluginApiculture; +import forestry.core.PluginCore; +import forestry.core.fluids.Fluids; import net.minecraft.init.Blocks; import net.minecraft.init.Items; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.oredict.OreDictionary; /** * Created by Elec332 on 12-5-2017. @@ -29,10 +34,56 @@ public final class RecipeRegister { info3.addRecipe(); } addForestryRecipes(); + addMiscItemRecipes(); } private static void addForestryRecipes(){ RecipeManagers.carpenterManager.addRecipe(100, Utils.getFluidFromName("water", 2000), ItemStack.EMPTY, new ItemStack(ExtraBees.dictionary), "X#X", "YEY", "RDR", '#', Blocks.GLASS_PANE, 'X', Items.GOLD_INGOT, 'Y', "ingotTin", 'R', Items.REDSTONE, 'D', Items.DIAMOND, 'E', Items.EMERALD); } + private static void addMiscItemRecipes(){ + final ItemStack lapisShard = ExtraBeeItems.LapisShard.get(1); + GameRegistry.addShapelessRecipe(new ItemStack(Items.DYE, 1, 4), lapisShard, lapisShard, lapisShard, lapisShard); + for (final ExtraBeeItems item : ExtraBeeItems.values()) { + if (item.metalString != null) { + ItemStack dust = null; + ItemStack ingot = null; + if (!OreDictionary.getOres("ingot" + item.metalString).isEmpty()) { + ingot = OreDictionary.getOres("ingot" + item.metalString).get(0).copy(); + } + if (!OreDictionary.getOres("dust" + item.metalString).isEmpty()) { + dust = OreDictionary.getOres("dust" + item.metalString).get(0).copy(); + } + final ItemStack input = item.get(1); + if (dust != null) { + GameRegistry.addShapelessRecipe(dust, input, input, input, input); + } else if (ingot != null) { + GameRegistry.addShapelessRecipe(ingot, input, input, input, input, input, input, input, input, input); + } else if (item == ExtraBeeItems.CoalDust) { + GameRegistry.addShapelessRecipe(new ItemStack(Items.COAL), input, input, input, input); + } + } else if (item.gemString != null) { + ItemStack gem = null; + if (!OreDictionary.getOres("gem" + item.gemString).isEmpty()) { + gem = OreDictionary.getOres("gem" + item.gemString).get(0); + } + final ItemStack input2 = item.get(1); + if (gem != null) { + GameRegistry.addShapelessRecipe(gem.copy(), input2, input2, input2, input2, input2, input2, input2, input2, input2); + } + } + } + Item woodGear = null; + try { + woodGear = (Item) Class.forName("buildcraft.BuildCraftCore").getField("woodenGearItem").get(null); + } catch (Exception ignored) { + } + ItemStack gear = new ItemStack(Blocks.PLANKS, 1); + if (woodGear != null) { + gear = new ItemStack(woodGear, 1); + } + RecipeManagers.carpenterManager.addRecipe(100, Fluids.FOR_HONEY.getFluid(500), ItemStack.EMPTY, ExtraBeeItems.ScentedGear.get(1), " j ", "bgb", " p ", 'j', PluginApiculture.getItems().royalJelly, 'b', PluginCore.getItems().beeswax, 'p', PluginApiculture.getItems().pollenCluster, 'g', gear); + + } + } diff --git a/src/main/java/binnie/extrabees/items/ItemBeehive.java b/src/main/java/binnie/extrabees/items/ItemBeehive.java index b59c4d77..bea02da8 100644 --- a/src/main/java/binnie/extrabees/items/ItemBeehive.java +++ b/src/main/java/binnie/extrabees/items/ItemBeehive.java @@ -8,10 +8,14 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; +import javax.annotation.Nonnull; + public class ItemBeehive extends ItemBlock { - public ItemBeehive(final Block block) { + @SuppressWarnings("all") + public ItemBeehive(@Nonnull final Block block) { super(block); + setRegistryName(block.getRegistryName()); this.setMaxDamage(0); this.setHasSubtypes(true); this.setCreativeTab(CreativeTabs.BUILDING_BLOCKS); diff --git a/src/main/java/binnie/extrabees/items/ItemDictionary.java b/src/main/java/binnie/extrabees/items/ItemDictionary.java index d346b8fb..1ab6b560 100644 --- a/src/main/java/binnie/extrabees/items/ItemDictionary.java +++ b/src/main/java/binnie/extrabees/items/ItemDictionary.java @@ -1,8 +1,7 @@ package binnie.extrabees.items; -import binnie.extrabees.ExtraBees; import binnie.extrabees.client.GuiHack; -import binnie.extrabees.core.ExtraBeeGUID; +import binnie.extrabees.client.ExtraBeeGUID; import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; import forestry.api.core.Tabs; diff --git a/src/main/java/binnie/extrabees/items/ItemHoneyComb.java b/src/main/java/binnie/extrabees/items/ItemHoneyComb.java index babec51a..6fda8840 100644 --- a/src/main/java/binnie/extrabees/items/ItemHoneyComb.java +++ b/src/main/java/binnie/extrabees/items/ItemHoneyComb.java @@ -1,10 +1,10 @@ package binnie.extrabees.items; import binnie.extrabees.ExtraBees; -import binnie.extrabees.core.ExtraBeeItems; import binnie.extrabees.items.types.EnumHoneyComb; import binnie.extrabees.items.types.EnumHoneyDrop; import binnie.extrabees.items.types.EnumPropolis; +import binnie.extrabees.items.types.ExtraBeeItems; import binnie.extrabees.utils.Utils; import forestry.api.core.Tabs; import forestry.apiculture.PluginApiculture; diff --git a/src/main/java/binnie/extrabees/items/ItemMiscProduct.java b/src/main/java/binnie/extrabees/items/ItemMiscProduct.java new file mode 100644 index 00000000..eafee4c7 --- /dev/null +++ b/src/main/java/binnie/extrabees/items/ItemMiscProduct.java @@ -0,0 +1,42 @@ +package binnie.extrabees.items; + +import binnie.extrabees.items.types.IEBEnumItem; +import binnie.extrabees.items.types.IEBItemMiscProvider; +import forestry.api.core.IModelManager; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import java.util.List; + +/** + * Created by Elec332 on 13-5-2017. + */ +public class ItemMiscProduct extends ItemProduct { + + public ItemMiscProduct(CreativeTabs tab, IEBItemMiscProvider[] types) { + super(types); + setCreativeTab(tab); + setRegistryName("misc"); + } + + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { + super.addInformation(stack, playerIn, tooltip, advanced); + ((IEBItemMiscProvider) get(stack)).addInformation(tooltip); + } + + @Override + @SideOnly(Side.CLIENT) + @SuppressWarnings("all") + public void registerModel(Item item, IModelManager manager) { + for (IEBEnumItem type : types) { + manager.registerItemModel(item, type.ordinal(), "misc/" + ((IEBItemMiscProvider) type).getModelPath()); + } + } + +} diff --git a/src/main/java/binnie/extrabees/items/ItemProduct.java b/src/main/java/binnie/extrabees/items/ItemProduct.java index ca63d177..f3113bd9 100644 --- a/src/main/java/binnie/extrabees/items/ItemProduct.java +++ b/src/main/java/binnie/extrabees/items/ItemProduct.java @@ -19,7 +19,7 @@ public class ItemProduct extends Item implements IItemModelRegister { this.types = types; } - private IEBEnumItem[] types; + protected IEBEnumItem[] types; public IEBEnumItem get(final ItemStack stack) { final int i = stack.getItemDamage(); diff --git a/src/main/java/binnie/extrabees/items/ItemPunnettSquare.java b/src/main/java/binnie/extrabees/items/ItemPunnettSquare.java index ae93aa94..3d45dd93 100644 --- a/src/main/java/binnie/extrabees/items/ItemPunnettSquare.java +++ b/src/main/java/binnie/extrabees/items/ItemPunnettSquare.java @@ -1,8 +1,7 @@ package binnie.extrabees.items; -import binnie.extrabees.ExtraBees; import binnie.extrabees.client.GuiHack; -import binnie.extrabees.core.ExtraBeeGUID; +import binnie.extrabees.client.ExtraBeeGUID; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; diff --git a/src/main/java/binnie/extrabees/core/ExtraBeeItems.java b/src/main/java/binnie/extrabees/items/types/ExtraBeeItems.java similarity index 52% rename from src/main/java/binnie/extrabees/core/ExtraBeeItems.java rename to src/main/java/binnie/extrabees/items/types/ExtraBeeItems.java index f0737c7a..4fd5243c 100644 --- a/src/main/java/binnie/extrabees/core/ExtraBeeItems.java +++ b/src/main/java/binnie/extrabees/items/types/ExtraBeeItems.java @@ -1,21 +1,13 @@ -package binnie.extrabees.core; +package binnie.extrabees.items.types; -import binnie.Binnie; -import binnie.core.Mods; -import binnie.core.item.IItemMiscProvider; import binnie.extrabees.ExtraBees; -import forestry.api.recipes.RecipeManagers; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; import javax.annotation.Nullable; import java.util.List; -public enum ExtraBeeItems implements IItemMiscProvider { +public enum ExtraBeeItems implements IEBItemMiscProvider { ScentedGear("Scented Gear", "scented_gear"), DiamondShard("Diamond Fragment", "diamond_shard"), @@ -55,68 +47,12 @@ public enum ExtraBeeItems implements IItemMiscProvider { this.modelPath = modelPath; } - String name; - String modelPath; + public final String name; + public final String modelPath; @Nullable - String metalString; + public String metalString; @Nullable - String gemString; - - public static void init() { - OreDictionary.registerOre("dyeRed", ExtraBeeItems.RedDye.get(1)); - OreDictionary.registerOre("dyeYellow", ExtraBeeItems.YellowDye.get(1)); - OreDictionary.registerOre("dyeBlue", ExtraBeeItems.BlueDye.get(1)); - OreDictionary.registerOre("dyeGreen", ExtraBeeItems.GreenDye.get(1)); - OreDictionary.registerOre("dyeBlack", ExtraBeeItems.BlackDye.get(1)); - OreDictionary.registerOre("dyeWhite", ExtraBeeItems.WhiteDye.get(1)); - OreDictionary.registerOre("dyeBrown", ExtraBeeItems.BrownDye.get(1)); - - OreDictionary.registerOre("gearWood", ExtraBeeItems.ScentedGear.get(1)); - } - - public static void postInit() { - final ItemStack lapisShard = ExtraBeeItems.LapisShard.get(1); - GameRegistry.addShapelessRecipe(new ItemStack(Items.DYE, 1, 4), lapisShard, lapisShard, lapisShard, lapisShard); - for (final ExtraBeeItems item : values()) { - if (item.metalString != null) { - ItemStack dust = null; - ItemStack ingot = null; - if (!OreDictionary.getOres("ingot" + item.metalString).isEmpty()) { - ingot = OreDictionary.getOres("ingot" + item.metalString).get(0).copy(); - } - if (!OreDictionary.getOres("dust" + item.metalString).isEmpty()) { - dust = OreDictionary.getOres("dust" + item.metalString).get(0).copy(); - } - final ItemStack input = item.get(1); - if (dust != null) { - GameRegistry.addShapelessRecipe(dust, input, input, input, input); - } else if (ingot != null) { - GameRegistry.addShapelessRecipe(ingot, input, input, input, input, input, input, input, input, input); - } else if (item == ExtraBeeItems.CoalDust) { - GameRegistry.addShapelessRecipe(new ItemStack(Items.COAL), input, input, input, input); - } - } else if (item.gemString != null) { - ItemStack gem = null; - if (!OreDictionary.getOres("gem" + item.gemString).isEmpty()) { - gem = OreDictionary.getOres("gem" + item.gemString).get(0); - } - final ItemStack input2 = item.get(1); - if (gem != null) { - GameRegistry.addShapelessRecipe(gem.copy(), input2, input2, input2, input2, input2, input2, input2, input2, input2); - } - } - } - Item woodGear = null; - try { - woodGear = (Item) Class.forName("buildcraft.BuildCraftCore").getField("woodenGearItem").get(null); - } catch (Exception ignored) { - } - ItemStack gear = new ItemStack(Blocks.PLANKS, 1); - if (woodGear != null) { - gear = new ItemStack(woodGear, 1); - } - RecipeManagers.carpenterManager.addRecipe(100, Binnie.LIQUID.getFluidStack("for.honey", 500), ItemStack.EMPTY, ExtraBeeItems.ScentedGear.get(1), " j ", "bgb", " p ", 'j', Mods.Forestry.item("royal_jelly"), 'b', Mods.Forestry.item("beeswax"), 'p', Mods.Forestry.item("pollen"), 'g', gear); - } + public String gemString; private void setGem(final String string) { this.gemString = string; diff --git a/src/main/java/binnie/extrabees/items/types/IEBItemMiscProvider.java b/src/main/java/binnie/extrabees/items/types/IEBItemMiscProvider.java new file mode 100644 index 00000000..a383c614 --- /dev/null +++ b/src/main/java/binnie/extrabees/items/types/IEBItemMiscProvider.java @@ -0,0 +1,14 @@ +package binnie.extrabees.items.types; + +import java.util.List; + +/** + * Created by Elec332 on 13-5-2017. + */ +public interface IEBItemMiscProvider extends IEBEnumItem { + + void addInformation(List tooltip); + + String getModelPath(); + +} diff --git a/src/main/java/binnie/extrabees/proxy/ExtraBeesCommonProxy.java b/src/main/java/binnie/extrabees/proxy/ExtraBeesCommonProxy.java index 46eaf697..7ae07fb4 100644 --- a/src/main/java/binnie/extrabees/proxy/ExtraBeesCommonProxy.java +++ b/src/main/java/binnie/extrabees/proxy/ExtraBeesCommonProxy.java @@ -12,7 +12,6 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public class ExtraBeesCommonProxy { public void registerBeeModel(ExtraBeesSpecies type) { - } public Block registerBlock(Block block){ @@ -29,7 +28,6 @@ public class ExtraBeesCommonProxy { } public void registerModel(Item item, int meta) { - } } diff --git a/src/main/java/binnie/extratrees/block/BlockETDecorativeLeaves.java b/src/main/java/binnie/extratrees/block/BlockETDecorativeLeaves.java index 5aad29a6..0557d618 100644 --- a/src/main/java/binnie/extratrees/block/BlockETDecorativeLeaves.java +++ b/src/main/java/binnie/extratrees/block/BlockETDecorativeLeaves.java @@ -21,11 +21,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockRenderLayer; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.NonNullList; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/binnie/extratrees/block/BlockETDoor.java b/src/main/java/binnie/extratrees/block/BlockETDoor.java index 1ab5c78a..675ef056 100644 --- a/src/main/java/binnie/extratrees/block/BlockETDoor.java +++ b/src/main/java/binnie/extratrees/block/BlockETDoor.java @@ -1,7 +1,5 @@ package binnie.extratrees.block; -import java.util.List; - import binnie.Binnie; import binnie.core.block.BlockMetadata; import binnie.core.block.IBlockMetadata; @@ -27,6 +25,8 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import java.util.List; + public class BlockETDoor extends BlockDoor implements IBlockMetadata, ITileEntityProvider { // private IIcon getFlippedIcon(final boolean upper, final boolean flip, final int tileMeta) { // final DoorType type = getDoorType(tileMeta); diff --git a/src/main/java/binnie/extratrees/block/ModuleBlocks.java b/src/main/java/binnie/extratrees/block/ModuleBlocks.java index f1a1beda..d405cf57 100644 --- a/src/main/java/binnie/extratrees/block/ModuleBlocks.java +++ b/src/main/java/binnie/extratrees/block/ModuleBlocks.java @@ -6,26 +6,11 @@ import binnie.core.Mods; import binnie.core.block.ItemMetadata; import binnie.core.liquid.ILiquidType; import binnie.extratrees.ExtraTrees; -import binnie.extratrees.block.decor.BlockHedge; -import binnie.extratrees.block.decor.BlockMultiFence; -import binnie.extratrees.block.decor.FenceType; -import binnie.extratrees.block.decor.MultiFenceRecipeEmbedded; -import binnie.extratrees.block.decor.MultiFenceRecipeSize; -import binnie.extratrees.block.decor.MultiFenceRecipeSolid; -import binnie.extratrees.block.wood.BlockETFence; -import binnie.extratrees.block.wood.BlockETLog; -import binnie.extratrees.block.wood.BlockETPlank; -import binnie.extratrees.block.wood.BlockETSlab; -import binnie.extratrees.block.wood.BlockShrubLog; -import binnie.extratrees.block.wood.ItemBlockETWood; -import binnie.extratrees.block.wood.ItemETSlab; +import binnie.extratrees.block.decor.*; +import binnie.extratrees.block.wood.*; import binnie.extratrees.genetics.ETTreeDefinition; import binnie.extratrees.item.ExtraTreeLiquid; -import forestry.api.arboriculture.EnumVanillaWoodType; -import forestry.api.arboriculture.IWoodAccess; -import forestry.api.arboriculture.IWoodType; -import forestry.api.arboriculture.TreeManager; -import forestry.api.arboriculture.WoodBlockKind; +import forestry.api.arboriculture.*; import forestry.api.recipes.RecipeManagers; import forestry.arboriculture.WoodAccess; import forestry.arboriculture.blocks.BlockForestryFenceGate; diff --git a/src/main/java/binnie/extratrees/block/PlankType.java b/src/main/java/binnie/extratrees/block/PlankType.java index 51c183a9..25427b96 100644 --- a/src/main/java/binnie/extratrees/block/PlankType.java +++ b/src/main/java/binnie/extratrees/block/PlankType.java @@ -3,11 +3,7 @@ package binnie.extratrees.block; import binnie.Constants; import binnie.extratrees.ExtraTrees; import binnie.extratrees.api.CarpentryManager; -import forestry.api.arboriculture.EnumForestryWoodType; -import forestry.api.arboriculture.EnumVanillaWoodType; -import forestry.api.arboriculture.IWoodType; -import forestry.api.arboriculture.TreeManager; -import forestry.api.arboriculture.WoodBlockKind; +import forestry.api.arboriculture.*; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.item.ItemStack; diff --git a/src/main/java/binnie/extratrees/block/WoodManager.java b/src/main/java/binnie/extratrees/block/WoodManager.java index 40dccfe1..8df26f9b 100644 --- a/src/main/java/binnie/extratrees/block/WoodManager.java +++ b/src/main/java/binnie/extratrees/block/WoodManager.java @@ -14,13 +14,9 @@ import forestry.core.utils.Translator; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; + import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; public class WoodManager { public static Map PLANKS; diff --git a/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java b/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java index ece3374f..7763dcb6 100644 --- a/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java +++ b/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java @@ -1,9 +1,5 @@ package binnie.extratrees.block.decor; -import java.util.List; - -import javax.annotation.Nullable; - import binnie.core.block.BlockMetadata; import binnie.core.block.IBlockMetadata; import binnie.core.block.TileEntityMetadata; @@ -54,6 +50,9 @@ import net.minecraftforge.common.property.IUnlistedProperty; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nullable; +import java.util.List; + public class BlockMultiFence extends BlockFence implements IBlockMetadata, IStateMapperRegister, IItemModelRegister, IBlockFence { public BlockMultiFence() { super(Material.WOOD, MapColor.WOOD); diff --git a/src/main/java/binnie/extratrees/block/decor/FenceType.java b/src/main/java/binnie/extratrees/block/decor/FenceType.java index 47710080..1216d82b 100644 --- a/src/main/java/binnie/extratrees/block/decor/FenceType.java +++ b/src/main/java/binnie/extratrees/block/decor/FenceType.java @@ -1,11 +1,11 @@ package binnie.extratrees.block.decor; +import binnie.extratrees.ExtraTrees; + import java.util.ArrayList; import java.util.Collection; import java.util.List; -import binnie.extratrees.ExtraTrees; - public class FenceType { public static List VALUES; diff --git a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java index 490dafce..2750dd6f 100644 --- a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java +++ b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java @@ -9,6 +9,7 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; + import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/binnie/extratrees/block/wood/BlockShrubLog.java b/src/main/java/binnie/extratrees/block/wood/BlockShrubLog.java index 9dc36c2c..cc1e53d1 100644 --- a/src/main/java/binnie/extratrees/block/wood/BlockShrubLog.java +++ b/src/main/java/binnie/extratrees/block/wood/BlockShrubLog.java @@ -1,12 +1,5 @@ package binnie.extratrees.block.wood; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.Random; - -import javax.annotation.Nullable; - import binnie.Constants; import binnie.extratrees.block.EnumShrubLog; import forestry.api.arboriculture.IWoodType; @@ -38,6 +31,12 @@ import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nullable; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Random; + public class BlockShrubLog extends Block implements IWoodTyped, IStateMapperRegister, IItemModelRegister { public static final PropertyBool FIREPROOF = PropertyBool.create("fireproof"); diff --git a/src/main/java/binnie/extratrees/carpentry/BlockDesign.java b/src/main/java/binnie/extratrees/carpentry/BlockDesign.java index 1d3f33d2..e08467ad 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockDesign.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockDesign.java @@ -11,11 +11,7 @@ import binnie.extratrees.api.CarpentryManager; import binnie.extratrees.api.IDesign; import binnie.extratrees.api.IDesignSystem; import binnie.extratrees.api.IToolHammer; -import forestry.api.core.IItemModelRegister; -import forestry.api.core.IModelManager; -import forestry.api.core.ISpriteRegister; -import forestry.api.core.IStateMapperRegister; -import forestry.api.core.ITextureManager; +import forestry.api.core.*; import forestry.core.blocks.IColoredBlock; import forestry.core.blocks.properties.UnlistedBlockAccess; import forestry.core.blocks.properties.UnlistedBlockPos; @@ -31,11 +27,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockRenderLayer; -import net.minecraft.util.EnumBlockRenderType; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.NonNullList; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/binnie/extratrees/carpentry/CarpentryInterface.java b/src/main/java/binnie/extratrees/carpentry/CarpentryInterface.java index 2e887911..b1c25c14 100644 --- a/src/main/java/binnie/extratrees/carpentry/CarpentryInterface.java +++ b/src/main/java/binnie/extratrees/carpentry/CarpentryInterface.java @@ -1,20 +1,10 @@ package binnie.extratrees.carpentry; -import binnie.extratrees.api.ICarpentryInterface; -import binnie.extratrees.api.IDesign; -import binnie.extratrees.api.IDesignCategory; -import binnie.extratrees.api.IDesignMaterial; -import binnie.extratrees.api.ILayout; -import binnie.extratrees.api.IPattern; +import binnie.extratrees.api.*; import net.minecraft.item.ItemStack; import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; +import java.util.*; public class CarpentryInterface implements ICarpentryInterface { static Map woodMap = new LinkedHashMap<>(); diff --git a/src/main/java/binnie/extratrees/carpentry/DesignBlock.java b/src/main/java/binnie/extratrees/carpentry/DesignBlock.java index a194c7d0..da4af138 100644 --- a/src/main/java/binnie/extratrees/carpentry/DesignBlock.java +++ b/src/main/java/binnie/extratrees/carpentry/DesignBlock.java @@ -1,10 +1,6 @@ package binnie.extratrees.carpentry; -import binnie.extratrees.api.IDesign; -import binnie.extratrees.api.IDesignMaterial; -import binnie.extratrees.api.IDesignSystem; -import binnie.extratrees.api.ILayout; -import binnie.extratrees.api.IToolHammer; +import binnie.extratrees.api.*; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/binnie/extratrees/core/ExtraTreesGUID.java b/src/main/java/binnie/extratrees/core/ExtraTreesGUID.java index 5fdc17c4..ad364521 100644 --- a/src/main/java/binnie/extratrees/core/ExtraTreesGUID.java +++ b/src/main/java/binnie/extratrees/core/ExtraTreesGUID.java @@ -3,14 +3,7 @@ package binnie.extratrees.core; import binnie.core.craftgui.minecraft.Window; import binnie.core.gui.IBinnieGUID; import binnie.extratrees.kitchen.craftgui.WindowBottleRack; -import binnie.extratrees.machines.craftgui.WindowArboristDatabase; -import binnie.extratrees.machines.craftgui.WindowBrewery; -import binnie.extratrees.machines.craftgui.WindowDistillery; -import binnie.extratrees.machines.craftgui.WindowLepidopteristDatabase; -import binnie.extratrees.machines.craftgui.WindowLumbermill; -import binnie.extratrees.machines.craftgui.WindowPress; -import binnie.extratrees.machines.craftgui.WindowSetSquare; -import binnie.extratrees.machines.craftgui.WindowWoodworker; +import binnie.extratrees.machines.craftgui.*; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/binnie/extratrees/gen/WorldGenAlder.java b/src/main/java/binnie/extratrees/gen/WorldGenAlder.java index 68b8fbfe..a9f3503f 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenAlder.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenAlder.java @@ -1,8 +1,5 @@ package binnie.extratrees.gen; -import java.util.List; -import java.util.Random; - import forestry.api.world.ITreeGenData; import forestry.arboriculture.worldgen.TreeBlockTypeLeaf; import forestry.core.worldgen.WorldGenHelper; @@ -10,6 +7,9 @@ import forestry.core.worldgen.WorldGenHelper.EnumReplaceMode; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import java.util.List; +import java.util.Random; + public class WorldGenAlder { public static class CommonAlder extends forestry.arboriculture.worldgen.WorldGenTree { public CommonAlder(ITreeGenData tree) { diff --git a/src/main/java/binnie/extratrees/gen/WorldGenApple.java b/src/main/java/binnie/extratrees/gen/WorldGenApple.java index e72bec10..239eb823 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenApple.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenApple.java @@ -1,14 +1,14 @@ package binnie.extratrees.gen; -import java.util.List; -import java.util.Random; - import forestry.api.world.ITreeGenData; import forestry.arboriculture.worldgen.TreeBlockTypeLeaf; import forestry.core.worldgen.WorldGenHelper; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import java.util.List; +import java.util.Random; + public class WorldGenApple { public static class OrchardApple extends forestry.arboriculture.worldgen.WorldGenTree { public OrchardApple(ITreeGenData tree) { diff --git a/src/main/java/binnie/extratrees/gen/WorldGenAsh.java b/src/main/java/binnie/extratrees/gen/WorldGenAsh.java index 9b02e3a9..e54c9260 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenAsh.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenAsh.java @@ -1,14 +1,14 @@ package binnie.extratrees.gen; -import java.util.List; -import java.util.Random; - import forestry.api.world.ITreeGenData; import forestry.arboriculture.worldgen.TreeBlockTypeLeaf; import forestry.core.worldgen.WorldGenHelper; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import java.util.List; +import java.util.Random; + public class WorldGenAsh { public static class CommonAsh extends forestry.arboriculture.worldgen.WorldGenTree { public CommonAsh(ITreeGenData tree) { diff --git a/src/main/java/binnie/extratrees/gen/WorldGenBanana.java b/src/main/java/binnie/extratrees/gen/WorldGenBanana.java index ca09757b..f7ac7246 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenBanana.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenBanana.java @@ -1,14 +1,14 @@ package binnie.extratrees.gen; -import java.util.List; -import java.util.Random; - import forestry.api.world.ITreeGenData; import forestry.arboriculture.worldgen.TreeBlockTypeLeaf; import forestry.core.worldgen.WorldGenHelper; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import java.util.List; +import java.util.Random; + public class WorldGenBanana extends forestry.arboriculture.worldgen.WorldGenTree { public WorldGenBanana(ITreeGenData tree) { super(tree, 6, 1); diff --git a/src/main/java/binnie/extratrees/gen/WorldGenBeech.java b/src/main/java/binnie/extratrees/gen/WorldGenBeech.java index d2b03503..deb17c0d 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenBeech.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenBeech.java @@ -1,14 +1,14 @@ package binnie.extratrees.gen; -import java.util.List; -import java.util.Random; - import forestry.api.world.ITreeGenData; import forestry.arboriculture.worldgen.TreeBlockTypeLeaf; import forestry.core.worldgen.WorldGenHelper; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import java.util.List; +import java.util.Random; + public class WorldGenBeech { public static class CommonBeech extends forestry.arboriculture.worldgen.WorldGenTree { public CommonBeech(ITreeGenData tree) { diff --git a/src/main/java/binnie/extratrees/gen/WorldGenConifer.java b/src/main/java/binnie/extratrees/gen/WorldGenConifer.java index f2bb043b..f3e3a47a 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenConifer.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenConifer.java @@ -1,14 +1,14 @@ package binnie.extratrees.gen; -import java.util.List; -import java.util.Random; - import forestry.api.world.ITreeGenData; import forestry.arboriculture.worldgen.TreeBlockTypeLeaf; import forestry.core.worldgen.WorldGenHelper; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import java.util.List; +import java.util.Random; + public class WorldGenConifer { public static class WesternHemlock extends forestry.arboriculture.worldgen.WorldGenTree { public WesternHemlock(ITreeGenData tree) { diff --git a/src/main/java/binnie/extratrees/gen/WorldGenPalm.java b/src/main/java/binnie/extratrees/gen/WorldGenPalm.java index 3a1212b4..8d6429a9 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenPalm.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenPalm.java @@ -1,14 +1,14 @@ package binnie.extratrees.gen; -import java.util.List; -import java.util.Random; - import forestry.api.world.ITreeGenData; import forestry.arboriculture.worldgen.TreeBlockTypeLeaf; import forestry.core.worldgen.WorldGenHelper; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import java.util.List; +import java.util.Random; + public class WorldGenPalm { public static class Coconut extends forestry.arboriculture.worldgen.WorldGenTree { public Coconut(ITreeGenData tree) { diff --git a/src/main/java/binnie/extratrees/gen/WorldGenShrub.java b/src/main/java/binnie/extratrees/gen/WorldGenShrub.java index f3b1fe94..40bce9a3 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenShrub.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenShrub.java @@ -1,12 +1,5 @@ package binnie.extratrees.gen; -import java.util.Collections; -import java.util.List; -import java.util.Random; -import java.util.Set; - -import javax.annotation.Nullable; - import forestry.api.arboriculture.ITreeModifier; import forestry.api.arboriculture.TreeManager; import forestry.api.world.ITreeGenData; @@ -18,6 +11,12 @@ import forestry.core.worldgen.WorldGenHelper.EnumReplaceMode; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import javax.annotation.Nullable; +import java.util.Collections; +import java.util.List; +import java.util.Random; +import java.util.Set; + public class WorldGenShrub { public static class Shrub extends WorldGenArboriculture { private static final int minHeight = 1; diff --git a/src/main/java/binnie/extratrees/gen/WorldGenWalnut.java b/src/main/java/binnie/extratrees/gen/WorldGenWalnut.java index 7debb973..8a8b9a54 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenWalnut.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenWalnut.java @@ -1,13 +1,14 @@ package binnie.extratrees.gen; -import java.util.List; -import java.util.Random; import forestry.api.world.ITreeGenData; import forestry.arboriculture.worldgen.TreeBlockTypeLeaf; +import forestry.arboriculture.worldgen.WorldGenTree; import forestry.core.worldgen.WorldGenHelper; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import forestry.arboriculture.worldgen.WorldGenTree; + +import java.util.List; +import java.util.Random; public class WorldGenWalnut { public static class BlackWalnut extends WorldGenTree { diff --git a/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java b/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java index 17f220f1..8794314a 100644 --- a/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java +++ b/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java @@ -8,13 +8,7 @@ import binnie.extratrees.config.ConfigurationMain; import binnie.extratrees.item.Food; import com.google.common.base.Preconditions; import com.google.common.base.Throwables; - -import forestry.api.arboriculture.EnumTreeChromosome; -import forestry.api.arboriculture.IAlleleFruit; -import forestry.api.arboriculture.IAlleleTreeSpecies; -import forestry.api.arboriculture.IFruitProvider; -import forestry.api.arboriculture.ITreeGenome; -import forestry.api.arboriculture.TreeManager; +import forestry.api.arboriculture.*; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IFruitFamily; @@ -33,11 +27,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; import java.lang.reflect.Field; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Random; +import java.util.*; public class AlleleETFruit extends AlleleCategorized implements IAlleleFruit, IFruitProvider { diff --git a/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java b/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java index f899e199..7ae36fd8 100644 --- a/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java +++ b/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java @@ -4,21 +4,15 @@ import binnie.Constants; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IClassification; -import forestry.api.lepidopterology.ButterflyManager; -import forestry.api.lepidopterology.EnumButterflyChromosome; -import forestry.api.lepidopterology.EnumFlutterType; -import forestry.api.lepidopterology.IAlleleButterflySpecies; -import forestry.api.lepidopterology.IAlleleButterflySpeciesBuilder; -import forestry.api.lepidopterology.IButterfly; -import forestry.api.lepidopterology.IButterflyGenome; -import forestry.api.lepidopterology.IButterflyMutationBuilder; +import forestry.api.lepidopterology.*; import forestry.core.genetics.alleles.AlleleHelper; import forestry.lepidopterology.genetics.Butterfly; import forestry.lepidopterology.genetics.ButterflyDefinition; import forestry.lepidopterology.genetics.IButterflyDefinition; import forestry.lepidopterology.genetics.MothDefinition; import net.minecraft.item.ItemStack; -import java.awt.Color; + +import java.awt.*; import java.util.Arrays; public enum ButterflySpecies implements IButterflyDefinition { diff --git a/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java b/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java index 921f6389..f8ac4601 100644 --- a/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java +++ b/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java @@ -4,51 +4,13 @@ import binnie.Constants; import binnie.core.genetics.ForestryAllele; import binnie.extratrees.block.EnumETLog; import binnie.extratrees.block.EnumShrubLog; -import binnie.extratrees.gen.WorldGenAlder; -import binnie.extratrees.gen.WorldGenApple; -import binnie.extratrees.gen.WorldGenAsh; -import binnie.extratrees.gen.WorldGenBanana; -import binnie.extratrees.gen.WorldGenBeech; -import binnie.extratrees.gen.WorldGenConifer; -import binnie.extratrees.gen.WorldGenEucalyptus; -import binnie.extratrees.gen.WorldGenFir; -import binnie.extratrees.gen.WorldGenHolly; -import binnie.extratrees.gen.WorldGenJungle; -import binnie.extratrees.gen.WorldGenLazy; -import binnie.extratrees.gen.WorldGenMaple; -import binnie.extratrees.gen.WorldGenPalm; -import binnie.extratrees.gen.WorldGenPoplar; -import binnie.extratrees.gen.WorldGenShrub; -import binnie.extratrees.gen.WorldGenSorbus; -import binnie.extratrees.gen.WorldGenTree; -import binnie.extratrees.gen.WorldGenTree2; -import binnie.extratrees.gen.WorldGenTree3; -import binnie.extratrees.gen.WorldGenTropical; -import binnie.extratrees.gen.WorldGenWalnut; +import binnie.extratrees.gen.*; import com.google.common.base.Preconditions; import com.mojang.authlib.GameProfile; -import forestry.api.arboriculture.EnumForestryWoodType; -import forestry.api.arboriculture.EnumGermlingType; -import forestry.api.arboriculture.EnumLeafType; -import forestry.api.arboriculture.EnumTreeChromosome; -import forestry.api.arboriculture.EnumVanillaWoodType; -import forestry.api.arboriculture.IAlleleTreeSpecies; -import forestry.api.arboriculture.IAlleleTreeSpeciesBuilder; -import forestry.api.arboriculture.ILeafSpriteProvider; -import forestry.api.arboriculture.ITree; -import forestry.api.arboriculture.ITreeGenerator; -import forestry.api.arboriculture.ITreeGenome; -import forestry.api.arboriculture.IWoodProvider; -import forestry.api.arboriculture.IWoodType; -import forestry.api.arboriculture.TreeManager; -import forestry.api.arboriculture.WoodBlockKind; +import forestry.api.arboriculture.*; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.EnumTolerance; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.IClassification; +import forestry.api.genetics.*; import forestry.api.world.ITreeGenData; import forestry.arboriculture.PluginArboriculture; import forestry.arboriculture.genetics.ClimateGrowthProvider; @@ -70,7 +32,7 @@ import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; import org.apache.commons.lang3.StringUtils; -import java.awt.Color; +import java.awt.*; import java.util.Arrays; import java.util.Locale; diff --git a/src/main/java/binnie/extratrees/genetics/EnumSaplingType.java b/src/main/java/binnie/extratrees/genetics/EnumSaplingType.java index 2f34022c..4a0bec23 100644 --- a/src/main/java/binnie/extratrees/genetics/EnumSaplingType.java +++ b/src/main/java/binnie/extratrees/genetics/EnumSaplingType.java @@ -10,7 +10,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.awt.Color; +import java.awt.*; public enum EnumSaplingType { Default, diff --git a/src/main/java/binnie/extratrees/integration/jei/ExtraTreesJeiPlugin.java b/src/main/java/binnie/extratrees/integration/jei/ExtraTreesJeiPlugin.java index 4657a7df..5654e9af 100644 --- a/src/main/java/binnie/extratrees/integration/jei/ExtraTreesJeiPlugin.java +++ b/src/main/java/binnie/extratrees/integration/jei/ExtraTreesJeiPlugin.java @@ -15,12 +15,7 @@ import binnie.extratrees.integration.jei.lumbermill.LumbermillRecipeCategory; import binnie.extratrees.integration.jei.lumbermill.LumbermillRecipeMaker; import binnie.extratrees.integration.jei.multifence.MultiFenceRecipeRegistryPlugin; import binnie.extratrees.machines.ExtraTreeMachine; -import mezz.jei.api.BlankModPlugin; -import mezz.jei.api.IGuiHelper; -import mezz.jei.api.IJeiHelpers; -import mezz.jei.api.IModRegistry; -import mezz.jei.api.ISubtypeRegistry; -import mezz.jei.api.JEIPlugin; +import mezz.jei.api.*; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeCategory.java b/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeCategory.java index 4a5a0ba6..d72dff89 100644 --- a/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeCategory.java +++ b/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeCategory.java @@ -3,11 +3,7 @@ package binnie.extratrees.integration.jei.brewery; import binnie.extratrees.integration.jei.ExtraTreesJeiPlugin; import binnie.extratrees.integration.jei.RecipeUids; import binnie.extratrees.machines.brewery.BreweryMachine; -import mezz.jei.api.gui.IDrawable; -import mezz.jei.api.gui.IDrawableAnimated; -import mezz.jei.api.gui.IGuiFluidStackGroup; -import mezz.jei.api.gui.IGuiItemStackGroup; -import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.gui.*; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeCategory; import net.minecraft.client.Minecraft; diff --git a/src/main/java/binnie/extratrees/integration/jei/fruitpress/FruitPressRecipeCategory.java b/src/main/java/binnie/extratrees/integration/jei/fruitpress/FruitPressRecipeCategory.java index b3f93818..121ecb1e 100644 --- a/src/main/java/binnie/extratrees/integration/jei/fruitpress/FruitPressRecipeCategory.java +++ b/src/main/java/binnie/extratrees/integration/jei/fruitpress/FruitPressRecipeCategory.java @@ -3,11 +3,7 @@ package binnie.extratrees.integration.jei.fruitpress; import binnie.extratrees.integration.jei.ExtraTreesJeiPlugin; import binnie.extratrees.integration.jei.RecipeUids; import binnie.extratrees.machines.fruitpress.FruitPressMachine; -import mezz.jei.api.gui.IDrawable; -import mezz.jei.api.gui.IDrawableAnimated; -import mezz.jei.api.gui.IGuiFluidStackGroup; -import mezz.jei.api.gui.IGuiItemStackGroup; -import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.gui.*; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeCategory; import net.minecraft.client.Minecraft; diff --git a/src/main/java/binnie/extratrees/integration/jei/lumbermill/LumbermillRecipeCategory.java b/src/main/java/binnie/extratrees/integration/jei/lumbermill/LumbermillRecipeCategory.java index 60662635..95570a9e 100644 --- a/src/main/java/binnie/extratrees/integration/jei/lumbermill/LumbermillRecipeCategory.java +++ b/src/main/java/binnie/extratrees/integration/jei/lumbermill/LumbermillRecipeCategory.java @@ -4,11 +4,7 @@ package binnie.extratrees.integration.jei.lumbermill; import binnie.extratrees.integration.jei.ExtraTreesJeiPlugin; import binnie.extratrees.integration.jei.RecipeUids; import binnie.extratrees.machines.lumbermill.LumbermillMachine; -import mezz.jei.api.gui.IDrawable; -import mezz.jei.api.gui.IDrawableAnimated; -import mezz.jei.api.gui.IGuiFluidStackGroup; -import mezz.jei.api.gui.IGuiItemStackGroup; -import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.gui.*; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeCategory; import net.minecraft.client.Minecraft; diff --git a/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeEmbeddedWrapper.java b/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeEmbeddedWrapper.java index bd686b34..abdb9df4 100644 --- a/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeEmbeddedWrapper.java +++ b/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeEmbeddedWrapper.java @@ -1,11 +1,5 @@ package binnie.extratrees.integration.jei.multifence; -import java.util.ArrayList; -import java.util.List; -import java.util.Map.Entry; - -import javax.annotation.Nullable; - import binnie.extratrees.block.IPlankType; import binnie.extratrees.block.WoodManager; import binnie.extratrees.block.decor.FenceDescription; @@ -15,6 +9,11 @@ import mezz.jei.api.recipe.BlankRecipeWrapper; import mezz.jei.api.recipe.wrapper.IShapedCraftingRecipeWrapper; import net.minecraft.item.ItemStack; +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.List; +import java.util.Map.Entry; + public class MultiFenceRecipeEmbeddedWrapper extends BlankRecipeWrapper implements IShapedCraftingRecipeWrapper { private FenceType fenceType; diff --git a/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeRegistryPlugin.java b/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeRegistryPlugin.java index d86b4846..ee9d24eb 100644 --- a/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeRegistryPlugin.java +++ b/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeRegistryPlugin.java @@ -1,23 +1,19 @@ package binnie.extratrees.integration.jei.multifence; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - import binnie.extratrees.block.IPlankType; import binnie.extratrees.block.WoodManager; import binnie.extratrees.block.decor.FenceDescription; import binnie.extratrees.block.decor.FenceType; import binnie.extratrees.block.decor.MultiFenceRecipePattern; -import mezz.jei.api.recipe.IFocus; -import mezz.jei.api.recipe.IRecipeCategory; -import mezz.jei.api.recipe.IRecipeRegistryPlugin; -import mezz.jei.api.recipe.IRecipeWrapper; -import mezz.jei.api.recipe.VanillaRecipeCategoryUid; +import mezz.jei.api.recipe.*; import mezz.jei.api.recipe.IFocus.Mode; import mezz.jei.gui.Focus; import net.minecraft.item.ItemStack; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + public class MultiFenceRecipeRegistryPlugin implements IRecipeRegistryPlugin { public List recipes = new ArrayList<>(); diff --git a/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeSizeWrapper.java b/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeSizeWrapper.java index e5098518..ba9fb6b0 100644 --- a/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeSizeWrapper.java +++ b/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeSizeWrapper.java @@ -1,11 +1,5 @@ package binnie.extratrees.integration.jei.multifence; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import javax.annotation.Nullable; - import binnie.extratrees.block.IPlankType; import binnie.extratrees.block.WoodManager; import binnie.extratrees.block.decor.MultiFenceRecipePattern; @@ -14,6 +8,11 @@ import mezz.jei.api.recipe.BlankRecipeWrapper; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + public class MultiFenceRecipeSizeWrapper extends BlankRecipeWrapper { @Nullable diff --git a/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeSolidWrapper.java b/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeSolidWrapper.java index 2db897ae..ce64e643 100644 --- a/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeSolidWrapper.java +++ b/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeSolidWrapper.java @@ -1,9 +1,5 @@ package binnie.extratrees.integration.jei.multifence; -import java.util.ArrayList; -import java.util.List; -import javax.annotation.Nullable; - import binnie.extratrees.block.IPlankType; import binnie.extratrees.block.WoodManager; import binnie.extratrees.block.decor.FenceDescription; @@ -13,6 +9,10 @@ import mezz.jei.api.recipe.BlankRecipeWrapper; import mezz.jei.api.recipe.wrapper.IShapedCraftingRecipeWrapper; import net.minecraft.item.ItemStack; +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.List; + public class MultiFenceRecipeSolidWrapper extends BlankRecipeWrapper implements IShapedCraftingRecipeWrapper { private FenceType fenceType; diff --git a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java index bd1e9983..4a4a4b60 100644 --- a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java +++ b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java @@ -1,10 +1,6 @@ package binnie.extratrees.kitchen.craftgui; -import binnie.core.craftgui.Attribute; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.ITooltip; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.*; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.events.EventWidget; import binnie.core.craftgui.geometry.Area; diff --git a/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java b/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java index 9f544dfb..defd050e 100644 --- a/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java +++ b/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java @@ -1,11 +1,7 @@ package binnie.extratrees.machines; import binnie.core.BinnieCore; -import binnie.core.machines.IMachineType; -import binnie.core.machines.Machine; -import binnie.core.machines.MachineComponent; -import binnie.core.machines.MachinePackage; -import binnie.core.machines.TileEntityMachine; +import binnie.core.machines.*; import binnie.core.machines.component.IInteraction; import binnie.core.resource.IBinnieTexture; import binnie.extratrees.ExtraTrees; diff --git a/src/main/java/binnie/extratrees/machines/Infuser.java b/src/main/java/binnie/extratrees/machines/Infuser.java index bde786f6..28b90945 100644 --- a/src/main/java/binnie/extratrees/machines/Infuser.java +++ b/src/main/java/binnie/extratrees/machines/Infuser.java @@ -3,11 +3,7 @@ package binnie.extratrees.machines; import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; -import binnie.core.machines.inventory.ComponentInventorySlots; -import binnie.core.machines.inventory.ComponentTankContainer; -import binnie.core.machines.inventory.MachineSide; -import binnie.core.machines.inventory.TankSlot; -import binnie.core.machines.inventory.TankValidator; +import binnie.core.machines.inventory.*; import binnie.core.machines.power.ComponentPowerReceptor; import binnie.core.machines.power.ComponentProcessSetCost; import binnie.core.machines.power.ErrorState; diff --git a/src/main/java/binnie/extratrees/machines/brewery/BreweryMachine.java b/src/main/java/binnie/extratrees/machines/brewery/BreweryMachine.java index 8222f6cc..e4f12c01 100644 --- a/src/main/java/binnie/extratrees/machines/brewery/BreweryMachine.java +++ b/src/main/java/binnie/extratrees/machines/brewery/BreweryMachine.java @@ -3,11 +3,7 @@ package binnie.extratrees.machines.brewery; import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; -import binnie.core.machines.inventory.ComponentInventorySlots; -import binnie.core.machines.inventory.ComponentTankContainer; -import binnie.core.machines.inventory.InventorySlot; -import binnie.core.machines.inventory.MachineSide; -import binnie.core.machines.inventory.TankSlot; +import binnie.core.machines.inventory.*; import binnie.core.machines.power.ComponentPowerReceptor; import binnie.extratrees.core.ExtraTreeTexture; import binnie.extratrees.core.ExtraTreesGUID; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/ControlTileSelect.java b/src/main/java/binnie/extratrees/machines/craftgui/ControlTileSelect.java index 77f6b8e0..dd15eae0 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/ControlTileSelect.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/ControlTileSelect.java @@ -2,11 +2,7 @@ package binnie.extratrees.machines.craftgui; import binnie.Binnie; import binnie.core.BinnieCore; -import binnie.core.craftgui.Attribute; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.ITooltip; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.*; import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.controls.core.IControlValue; @@ -27,11 +23,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; public class ControlTileSelect extends Control implements IControlValue, IControlScrollable { IDesign value; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesTreeGenome.java b/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesTreeGenome.java index 52d311bb..9a3c7e5c 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesTreeGenome.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesTreeGenome.java @@ -14,12 +14,7 @@ import binnie.core.craftgui.geometry.TextJustification; import binnie.core.craftgui.minecraft.control.ControlItemDisplay; import binnie.core.genetics.BreedingSystem; import binnie.extratrees.ExtraTrees; -import forestry.api.arboriculture.EnumTreeChromosome; -import forestry.api.arboriculture.IAlleleTreeSpecies; -import forestry.api.arboriculture.IFruitProvider; -import forestry.api.arboriculture.ILeafSpriteProvider; -import forestry.api.arboriculture.ITree; -import forestry.api.arboriculture.ITreeGenome; +import forestry.api.arboriculture.*; import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleSpecies; import net.minecraft.client.Minecraft; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowArboristDatabase.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowArboristDatabase.java index 5a3f4247..433eddcd 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowArboristDatabase.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowArboristDatabase.java @@ -4,17 +4,7 @@ import binnie.Binnie; import binnie.core.AbstractMod; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.listbox.ControlListBox; -import binnie.core.craftgui.database.ControlItemStackOption; -import binnie.core.craftgui.database.DatabaseTab; -import binnie.core.craftgui.database.IDatabaseMode; -import binnie.core.craftgui.database.PageBranchOverview; -import binnie.core.craftgui.database.PageBranchSpecies; -import binnie.core.craftgui.database.PageBreeder; -import binnie.core.craftgui.database.PageSpeciesClassification; -import binnie.core.craftgui.database.PageSpeciesMutations; -import binnie.core.craftgui.database.PageSpeciesOverview; -import binnie.core.craftgui.database.PageSpeciesResultant; -import binnie.core.craftgui.database.WindowAbstractDatabase; +import binnie.core.craftgui.database.*; import binnie.core.craftgui.geometry.Area; import binnie.core.craftgui.minecraft.Window; import binnie.core.genetics.TreeBreedingSystem; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowBrewery.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowBrewery.java index a245a8ed..e04867c0 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowBrewery.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowBrewery.java @@ -3,12 +3,7 @@ package binnie.extratrees.machines.craftgui; import binnie.core.AbstractMod; import binnie.core.craftgui.geometry.Position; import binnie.core.craftgui.minecraft.Window; -import binnie.core.craftgui.minecraft.control.ControlEnergyBar; -import binnie.core.craftgui.minecraft.control.ControlErrorState; -import binnie.core.craftgui.minecraft.control.ControlLiquidTank; -import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; -import binnie.core.craftgui.minecraft.control.ControlSlot; -import binnie.core.craftgui.minecraft.control.ControlSlotArray; +import binnie.core.craftgui.minecraft.control.*; import binnie.core.machines.Machine; import binnie.extratrees.ExtraTrees; import binnie.extratrees.machines.brewery.BreweryMachine; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowLepidopteristDatabase.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowLepidopteristDatabase.java index 35ff502b..00355708 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowLepidopteristDatabase.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowLepidopteristDatabase.java @@ -2,15 +2,7 @@ package binnie.extratrees.machines.craftgui; import binnie.Binnie; import binnie.core.AbstractMod; -import binnie.core.craftgui.database.DatabaseTab; -import binnie.core.craftgui.database.PageBranchOverview; -import binnie.core.craftgui.database.PageBranchSpecies; -import binnie.core.craftgui.database.PageBreeder; -import binnie.core.craftgui.database.PageSpeciesClassification; -import binnie.core.craftgui.database.PageSpeciesMutations; -import binnie.core.craftgui.database.PageSpeciesOverview; -import binnie.core.craftgui.database.PageSpeciesResultant; -import binnie.core.craftgui.database.WindowAbstractDatabase; +import binnie.core.craftgui.database.*; import binnie.core.craftgui.minecraft.Window; import binnie.extratrees.ExtraTrees; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowLumbermill.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowLumbermill.java index e260d890..856c6864 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowLumbermill.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowLumbermill.java @@ -3,11 +3,7 @@ package binnie.extratrees.machines.craftgui; import binnie.core.AbstractMod; import binnie.core.craftgui.geometry.Position; import binnie.core.craftgui.minecraft.Window; -import binnie.core.craftgui.minecraft.control.ControlEnergyBar; -import binnie.core.craftgui.minecraft.control.ControlErrorState; -import binnie.core.craftgui.minecraft.control.ControlLiquidTank; -import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; -import binnie.core.craftgui.minecraft.control.ControlSlot; +import binnie.core.craftgui.minecraft.control.*; import binnie.core.machines.Machine; import binnie.extratrees.ExtraTrees; import binnie.extratrees.machines.lumbermill.LumbermillMachine; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowPress.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowPress.java index de0a7760..841c441b 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowPress.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowPress.java @@ -4,11 +4,7 @@ import binnie.core.AbstractMod; import binnie.core.craftgui.geometry.Position; import binnie.core.craftgui.minecraft.InventoryType; import binnie.core.craftgui.minecraft.Window; -import binnie.core.craftgui.minecraft.control.ControlEnergyBar; -import binnie.core.craftgui.minecraft.control.ControlErrorState; -import binnie.core.craftgui.minecraft.control.ControlLiquidTank; -import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; -import binnie.core.craftgui.minecraft.control.ControlSlot; +import binnie.core.craftgui.minecraft.control.*; import binnie.core.machines.Machine; import binnie.core.machines.power.ErrorState; import binnie.extratrees.ExtraTrees; diff --git a/src/main/java/binnie/extratrees/machines/distillery/DistilleryRecipes.java b/src/main/java/binnie/extratrees/machines/distillery/DistilleryRecipes.java index 708301c4..3bab2ee7 100644 --- a/src/main/java/binnie/extratrees/machines/distillery/DistilleryRecipes.java +++ b/src/main/java/binnie/extratrees/machines/distillery/DistilleryRecipes.java @@ -5,12 +5,7 @@ import net.minecraftforge.fluids.FluidStack; import org.apache.commons.lang3.tuple.Pair; import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; public class DistilleryRecipes { private static final List>> recipes = new ArrayList<>(); diff --git a/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillMachine.java b/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillMachine.java index 25d9fc49..b6d15259 100644 --- a/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillMachine.java +++ b/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillMachine.java @@ -3,11 +3,7 @@ package binnie.extratrees.machines.lumbermill; import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; -import binnie.core.machines.inventory.ComponentInventorySlots; -import binnie.core.machines.inventory.ComponentTankContainer; -import binnie.core.machines.inventory.InventorySlot; -import binnie.core.machines.inventory.TankSlot; -import binnie.core.machines.inventory.TankValidator; +import binnie.core.machines.inventory.*; import binnie.core.machines.power.ComponentPowerReceptor; import binnie.extratrees.core.ExtraTreeTexture; import binnie.extratrees.core.ExtraTreesGUID; diff --git a/src/main/java/binnie/genetics/CreativeTabGenetics.java b/src/main/java/binnie/genetics/CreativeTabGenetics.java index f6dbe5d9..e6cb03e9 100644 --- a/src/main/java/binnie/genetics/CreativeTabGenetics.java +++ b/src/main/java/binnie/genetics/CreativeTabGenetics.java @@ -1,6 +1,5 @@ package binnie.genetics; -import binnie.extrabees.ExtraBees; import binnie.genetics.item.GeneticsItems; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; @@ -23,7 +22,7 @@ public class CreativeTabGenetics extends CreativeTabs { @Override @SideOnly(Side.CLIENT) public String getTabLabel() { - return ExtraBees.proxy.localise("tab.genetics"); + return Genetics.proxy.localise("tab.genetics"); } @Override diff --git a/src/main/java/binnie/genetics/genetics/GeneticEngineeringSystem.java b/src/main/java/binnie/genetics/genetics/GeneticEngineeringSystem.java index 82eafdca..76b28f78 100644 --- a/src/main/java/binnie/genetics/genetics/GeneticEngineeringSystem.java +++ b/src/main/java/binnie/genetics/genetics/GeneticEngineeringSystem.java @@ -2,19 +2,9 @@ package binnie.genetics.genetics; import binnie.core.genetics.BreedingSystem; import com.google.common.base.Throwables; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IAlleleFloat; -import forestry.api.genetics.IAlleleInteger; -import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.IIndividual; -import forestry.api.genetics.ISpeciesRoot; +import forestry.api.genetics.*; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.TreeSet; +import java.util.*; public class GeneticEngineeringSystem { BreedingSystem breedingSystem; diff --git a/src/main/java/binnie/genetics/gui/AnalystPageGenome.java b/src/main/java/binnie/genetics/gui/AnalystPageGenome.java index 3e9ef545..21e013ec 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageGenome.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageGenome.java @@ -11,11 +11,7 @@ import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.geometry.TextJustification; import binnie.core.genetics.BreedingSystem; import binnie.genetics.Genetics; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.IIndividual; -import forestry.api.genetics.ISpeciesRoot; +import forestry.api.genetics.*; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/binnie/genetics/gui/AnalystPageMutations.java b/src/main/java/binnie/genetics/gui/AnalystPageMutations.java index d9afcaf1..0e1dcef8 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageMutations.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageMutations.java @@ -15,9 +15,8 @@ import binnie.core.craftgui.minecraft.control.ControlItemDisplay; import binnie.core.craftgui.renderer.RenderUtil; import binnie.core.genetics.BreedingSystem; import binnie.core.genetics.ForestryAllele; +import binnie.core.integration.extrabees.ExtraBeesIntegration; import binnie.core.resource.BinnieSprite; -import binnie.extrabees.ExtraBees; -import binnie.extrabees.genetics.ExtraBeesSpecies; import binnie.genetics.Genetics; import binnie.genetics.item.ModuleItems; import forestry.api.apiculture.IBee; @@ -48,14 +47,16 @@ public class AnalystPageMutations extends ControlAnalystPage { final Collection further = system.getFurtherMutations(speciesCurrent); if (ind instanceof IBee) { ItemStack hive = null; - if (ind.getGenome().getPrimary() == ExtraBeesSpecies.WATER) { - hive = new ItemStack(ExtraBees.hive, 1, 0); - } - if (ind.getGenome().getPrimary() == ExtraBeesSpecies.ROCK) { - hive = new ItemStack(ExtraBees.hive, 1, 1); - } - if (ind.getGenome().getPrimary() == ExtraBeesSpecies.BASALT) { - hive = new ItemStack(ExtraBees.hive, 1, 2); + if (ExtraBeesIntegration.isLoaded()) { + if (ind.getGenome().getPrimary() == ExtraBeesIntegration.water) { + hive = new ItemStack(ExtraBeesIntegration.hive, 1, 0); + } + if (ind.getGenome().getPrimary() == ExtraBeesIntegration.rock) { + hive = new ItemStack(ExtraBeesIntegration.hive, 1, 1); + } + if (ind.getGenome().getPrimary() == ExtraBeesIntegration.basalt) { + hive = new ItemStack(ExtraBeesIntegration.hive, 1, 2); + } } if (ind.getGenome().getPrimary() == ForestryAllele.BeeSpecies.Forest.getAllele()) { hive = new ItemStack(Mods.Forestry.block("beehives"), 1, 1); diff --git a/src/main/java/binnie/genetics/gui/ControlAnalystChromosome.java b/src/main/java/binnie/genetics/gui/ControlAnalystChromosome.java index 0299b930..2862c5ff 100644 --- a/src/main/java/binnie/genetics/gui/ControlAnalystChromosome.java +++ b/src/main/java/binnie/genetics/gui/ControlAnalystChromosome.java @@ -1,11 +1,7 @@ package binnie.genetics.gui; import binnie.Binnie; -import binnie.core.craftgui.Attribute; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.ITooltip; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.*; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.resource.Texture; diff --git a/src/main/java/binnie/genetics/gui/ControlChromoPicker.java b/src/main/java/binnie/genetics/gui/ControlChromoPicker.java index dbf7c1f2..bd1fdd44 100644 --- a/src/main/java/binnie/genetics/gui/ControlChromoPicker.java +++ b/src/main/java/binnie/genetics/gui/ControlChromoPicker.java @@ -11,7 +11,7 @@ import binnie.core.craftgui.events.EventWidget; import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.StandardTexture; -import binnie.extrabees.core.ExtraBeeTexture; +import binnie.extrabees.client.ExtraBeeTexture; import forestry.api.genetics.IChromosomeType; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/genetics/gui/ControlChromosome.java b/src/main/java/binnie/genetics/gui/ControlChromosome.java index e189a66a..70e62439 100644 --- a/src/main/java/binnie/genetics/gui/ControlChromosome.java +++ b/src/main/java/binnie/genetics/gui/ControlChromosome.java @@ -10,7 +10,6 @@ import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.core.texture.BinnieCoreTexture; - import com.google.common.base.Preconditions; import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.arboriculture.EnumTreeChromosome; diff --git a/src/main/java/binnie/genetics/gui/WindowAnalyst.java b/src/main/java/binnie/genetics/gui/WindowAnalyst.java index 36a38d0d..bd37e7cf 100644 --- a/src/main/java/binnie/genetics/gui/WindowAnalyst.java +++ b/src/main/java/binnie/genetics/gui/WindowAnalyst.java @@ -3,11 +3,7 @@ package binnie.genetics.gui; import binnie.Binnie; import binnie.botany.api.IFlower; import binnie.core.AbstractMod; -import binnie.core.craftgui.Attribute; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.Tooltip; -import binnie.core.craftgui.Widget; +import binnie.core.craftgui.*; import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.controls.scroll.ControlScrollBar; diff --git a/src/main/java/binnie/genetics/gui/tree/AnalystPageFruit.java b/src/main/java/binnie/genetics/gui/tree/AnalystPageFruit.java index b81cb15d..7cccd60c 100644 --- a/src/main/java/binnie/genetics/gui/tree/AnalystPageFruit.java +++ b/src/main/java/binnie/genetics/gui/tree/AnalystPageFruit.java @@ -9,7 +9,6 @@ import binnie.core.craftgui.minecraft.control.ControlItemDisplay; import binnie.core.util.UniqueItemStackSet; import binnie.genetics.Genetics; import binnie.genetics.gui.AnalystPageProduce; - import com.google.common.base.Throwables; import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.IAlleleFruit; diff --git a/src/main/java/binnie/genetics/integration/jei/GeneticsJeiPlugin.java b/src/main/java/binnie/genetics/integration/jei/GeneticsJeiPlugin.java index a6829d78..14f2608e 100644 --- a/src/main/java/binnie/genetics/integration/jei/GeneticsJeiPlugin.java +++ b/src/main/java/binnie/genetics/integration/jei/GeneticsJeiPlugin.java @@ -27,12 +27,7 @@ import binnie.genetics.machine.GeneticMachine; import binnie.genetics.machine.LaboratoryMachine; import binnie.genetics.machine.incubator.Incubator; import forestry.api.genetics.ISpeciesRoot; -import mezz.jei.api.BlankModPlugin; -import mezz.jei.api.IGuiHelper; -import mezz.jei.api.IJeiHelpers; -import mezz.jei.api.IModRegistry; -import mezz.jei.api.ISubtypeRegistry; -import mezz.jei.api.JEIPlugin; +import mezz.jei.api.*; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/binnie/genetics/integration/jei/database/DatabaseRecipeWrapper.java b/src/main/java/binnie/genetics/integration/jei/database/DatabaseRecipeWrapper.java index 3e00d674..09ac5e98 100644 --- a/src/main/java/binnie/genetics/integration/jei/database/DatabaseRecipeWrapper.java +++ b/src/main/java/binnie/genetics/integration/jei/database/DatabaseRecipeWrapper.java @@ -11,7 +11,7 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.awt.Color; +import java.awt.*; import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/src/main/java/binnie/genetics/integration/jei/genepool/GenepoolRecipeCategory.java b/src/main/java/binnie/genetics/integration/jei/genepool/GenepoolRecipeCategory.java index e0b52f5b..9e37484d 100644 --- a/src/main/java/binnie/genetics/integration/jei/genepool/GenepoolRecipeCategory.java +++ b/src/main/java/binnie/genetics/integration/jei/genepool/GenepoolRecipeCategory.java @@ -3,11 +3,7 @@ package binnie.genetics.integration.jei.genepool; import binnie.genetics.integration.jei.GeneticsJeiPlugin; import binnie.genetics.integration.jei.RecipeUids; import binnie.genetics.machine.genepool.Genepool; -import mezz.jei.api.gui.IDrawable; -import mezz.jei.api.gui.IDrawableAnimated; -import mezz.jei.api.gui.IGuiFluidStackGroup; -import mezz.jei.api.gui.IGuiItemStackGroup; -import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.gui.*; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeCategory; import net.minecraft.client.Minecraft; diff --git a/src/main/java/binnie/genetics/integration/jei/genepool/GenepoolRecipeMaker.java b/src/main/java/binnie/genetics/integration/jei/genepool/GenepoolRecipeMaker.java index 2583c642..2f226c6e 100644 --- a/src/main/java/binnie/genetics/integration/jei/genepool/GenepoolRecipeMaker.java +++ b/src/main/java/binnie/genetics/integration/jei/genepool/GenepoolRecipeMaker.java @@ -1,10 +1,6 @@ package binnie.genetics.integration.jei.genepool; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IIndividual; -import forestry.api.genetics.ISpeciesRoot; -import forestry.api.genetics.ISpeciesType; +import forestry.api.genetics.*; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; diff --git a/src/main/java/binnie/genetics/integration/jei/genepool/GenepoolRecipeWrapper.java b/src/main/java/binnie/genetics/integration/jei/genepool/GenepoolRecipeWrapper.java index 0342678b..93fdf69b 100644 --- a/src/main/java/binnie/genetics/integration/jei/genepool/GenepoolRecipeWrapper.java +++ b/src/main/java/binnie/genetics/integration/jei/genepool/GenepoolRecipeWrapper.java @@ -12,7 +12,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.awt.Color; +import java.awt.*; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeCategory.java b/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeCategory.java index f6283aef..519d39cd 100644 --- a/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeCategory.java +++ b/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeCategory.java @@ -3,11 +3,7 @@ package binnie.genetics.integration.jei.incubator; import binnie.genetics.integration.jei.GeneticsJeiPlugin; import binnie.genetics.integration.jei.RecipeUids; import binnie.genetics.machine.incubator.Incubator; -import mezz.jei.api.gui.IDrawable; -import mezz.jei.api.gui.IDrawableAnimated; -import mezz.jei.api.gui.IGuiFluidStackGroup; -import mezz.jei.api.gui.IGuiItemStackGroup; -import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.gui.*; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeCategory; import net.minecraft.client.Minecraft; diff --git a/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeWrapper.java b/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeWrapper.java index 8f10873f..a7f5a974 100644 --- a/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeWrapper.java +++ b/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeWrapper.java @@ -9,7 +9,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.awt.Color; +import java.awt.*; public class IncubatorRecipeWrapper extends BlankRecipeWrapper { private final IIncubatorRecipe recipe; diff --git a/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeCategory.java b/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeCategory.java index 9c24351f..4ae73206 100644 --- a/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeCategory.java +++ b/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeCategory.java @@ -10,11 +10,7 @@ import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; -import mezz.jei.api.gui.IDrawable; -import mezz.jei.api.gui.IDrawableAnimated; -import mezz.jei.api.gui.IGuiFluidStackGroup; -import mezz.jei.api.gui.IGuiItemStackGroup; -import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.gui.*; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeCategory; import mezz.jei.api.recipe.IFocus; diff --git a/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeMaker.java b/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeMaker.java index 67a1c22c..a8a16d03 100644 --- a/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeMaker.java +++ b/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeMaker.java @@ -6,11 +6,7 @@ import binnie.core.genetics.Gene; import binnie.genetics.genetics.Engineering; import binnie.genetics.item.ItemSerum; import binnie.genetics.item.ItemSerumArray; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.IIndividual; -import forestry.api.genetics.ISpeciesRoot; -import forestry.api.genetics.ISpeciesType; +import forestry.api.genetics.*; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; diff --git a/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeWrapper.java b/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeWrapper.java index 0d9d2939..1a2c4a7d 100644 --- a/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeWrapper.java +++ b/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeWrapper.java @@ -15,7 +15,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.apache.commons.lang3.time.DurationFormatUtils; import javax.annotation.Nullable; -import java.awt.Color; +import java.awt.*; import java.text.NumberFormat; import java.util.Arrays; import java.util.Map; diff --git a/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeCategory.java b/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeCategory.java index df66fd94..872b45ad 100644 --- a/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeCategory.java +++ b/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeCategory.java @@ -3,18 +3,14 @@ package binnie.genetics.integration.jei.isolator; import binnie.genetics.integration.jei.GeneticsJeiPlugin; import binnie.genetics.integration.jei.RecipeUids; import binnie.genetics.machine.isolator.Isolator; -import mezz.jei.api.gui.IDrawable; -import mezz.jei.api.gui.IDrawableAnimated; -import mezz.jei.api.gui.IGuiFluidStackGroup; -import mezz.jei.api.gui.IGuiItemStackGroup; -import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.gui.*; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeCategory; import net.minecraft.client.Minecraft; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.awt.Color; +import java.awt.*; public class IsolatorRecipeCategory extends BlankRecipeCategory { private final IDrawableAnimated arrowAnimated; diff --git a/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeMaker.java b/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeMaker.java index b670e044..8527ffec 100644 --- a/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeMaker.java +++ b/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeMaker.java @@ -2,12 +2,7 @@ package binnie.genetics.integration.jei.isolator; import binnie.core.genetics.Gene; import binnie.genetics.item.ItemSequence; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.IIndividual; -import forestry.api.genetics.ISpeciesRoot; -import forestry.api.genetics.ISpeciesType; +import forestry.api.genetics.*; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; diff --git a/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeWrapper.java b/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeWrapper.java index 06727276..bc1427c5 100644 --- a/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeWrapper.java +++ b/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeWrapper.java @@ -11,7 +11,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.awt.Color; +import java.awt.*; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/binnie/genetics/integration/jei/polymeriser/PolymeriserRecipeCategory.java b/src/main/java/binnie/genetics/integration/jei/polymeriser/PolymeriserRecipeCategory.java index ce2c2b96..9de4aecf 100644 --- a/src/main/java/binnie/genetics/integration/jei/polymeriser/PolymeriserRecipeCategory.java +++ b/src/main/java/binnie/genetics/integration/jei/polymeriser/PolymeriserRecipeCategory.java @@ -3,11 +3,7 @@ package binnie.genetics.integration.jei.polymeriser; import binnie.genetics.integration.jei.GeneticsJeiPlugin; import binnie.genetics.integration.jei.RecipeUids; import binnie.genetics.machine.polymeriser.Polymeriser; -import mezz.jei.api.gui.IDrawable; -import mezz.jei.api.gui.IDrawableAnimated; -import mezz.jei.api.gui.IGuiFluidStackGroup; -import mezz.jei.api.gui.IGuiItemStackGroup; -import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.gui.*; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeCategory; import net.minecraft.client.Minecraft; diff --git a/src/main/java/binnie/genetics/item/ItemSerumArray.java b/src/main/java/binnie/genetics/item/ItemSerumArray.java index b040513d..0b9c603d 100644 --- a/src/main/java/binnie/genetics/item/ItemSerumArray.java +++ b/src/main/java/binnie/genetics/item/ItemSerumArray.java @@ -9,12 +9,7 @@ import binnie.genetics.api.IItemSerum; import binnie.genetics.genetics.GeneArrayItem; import binnie.genetics.genetics.IGeneItem; import com.google.common.base.Preconditions; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IChromosome; -import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.IIndividual; -import forestry.api.genetics.ISpeciesRoot; +import forestry.api.genetics.*; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/binnie/genetics/item/ModuleItems.java b/src/main/java/binnie/genetics/item/ModuleItems.java index dab5e890..b5d3ed36 100644 --- a/src/main/java/binnie/genetics/item/ModuleItems.java +++ b/src/main/java/binnie/genetics/item/ModuleItems.java @@ -1,21 +1,18 @@ package binnie.genetics.item; -import javax.annotation.Nullable; - -import com.google.common.base.Preconditions; - import binnie.Binnie; import binnie.botany.Botany; import binnie.core.BinnieCore; import binnie.core.IInitializable; import binnie.core.Mods; +import binnie.core.integration.extrabees.ExtraBeesIntegration; import binnie.core.item.ItemMisc; import binnie.core.liquid.FluidContainerType; import binnie.core.resource.BinnieSprite; -import binnie.extrabees.ExtraBees; import binnie.extratrees.ExtraTrees; import binnie.genetics.CreativeTabGenetics; import binnie.genetics.Genetics; +import com.google.common.base.Preconditions; import forestry.api.recipes.RecipeManagers; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -25,6 +22,8 @@ import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; +import javax.annotation.Nullable; + public class ModuleItems implements IInitializable { public static BinnieSprite iconNight; public static BinnieSprite iconDaytime; @@ -169,7 +168,7 @@ public class ModuleItems implements IInitializable { " d ", 'c', GeneticsItems.IntegratedCircuit.get(itemGenetics, 1), 'a', Mods.Forestry.item("portable_alyzer"), 'd', new ItemStack(Items.DIAMOND)); - Item[] databases = {ExtraBees.dictionary, ExtraTrees.items().itemDictionary, ExtraTrees.items().itemDictionaryLepi, Botany.database}; + Item[] databases = {ExtraBeesIntegration.dictionary, ExtraTrees.items().itemDictionary, ExtraTrees.items().itemDictionaryLepi, Botany.database}; if (BinnieCore.isBotanyActive() && BinnieCore.isExtraBeesActive() && BinnieCore.isExtraTreesActive()) { for (Item databaseA : databases) { for (Item databaseB : databases) { diff --git a/src/main/java/binnie/genetics/machine/LaboratoryMachine.java b/src/main/java/binnie/genetics/machine/LaboratoryMachine.java index f5834b02..f4180b66 100644 --- a/src/main/java/binnie/genetics/machine/LaboratoryMachine.java +++ b/src/main/java/binnie/genetics/machine/LaboratoryMachine.java @@ -1,10 +1,6 @@ package binnie.genetics.machine; -import binnie.core.machines.IMachine; -import binnie.core.machines.IMachineType; -import binnie.core.machines.Machine; -import binnie.core.machines.MachineComponent; -import binnie.core.machines.MachinePackage; +import binnie.core.machines.*; import binnie.core.machines.component.IInteraction; import binnie.core.machines.network.INetwork; import binnie.genetics.Genetics; diff --git a/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java b/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java index 236ae324..9c377567 100644 --- a/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java +++ b/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java @@ -17,11 +17,7 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; public class Acclimatiser { public static final int[] SLOT_RESERVE = new int[]{0, 1, 2, 3}; diff --git a/src/main/java/binnie/genetics/machine/acclimatiser/ToleranceSystem.java b/src/main/java/binnie/genetics/machine/acclimatiser/ToleranceSystem.java index 5ca69c5d..71997aeb 100644 --- a/src/main/java/binnie/genetics/machine/acclimatiser/ToleranceSystem.java +++ b/src/main/java/binnie/genetics/machine/acclimatiser/ToleranceSystem.java @@ -3,12 +3,7 @@ package binnie.genetics.machine.acclimatiser; import binnie.core.genetics.Gene; import binnie.core.genetics.Tolerance; import binnie.genetics.machine.inoculator.Inoculator; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAlleleTolerance; -import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.IGenome; -import forestry.api.genetics.IIndividual; -import forestry.api.genetics.ISpeciesRoot; +import forestry.api.genetics.*; import net.minecraft.item.ItemStack; import java.util.Random; diff --git a/src/main/java/binnie/genetics/machine/acclimatiser/WindowAcclimatiser.java b/src/main/java/binnie/genetics/machine/acclimatiser/WindowAcclimatiser.java index 876cd1d7..2f081433 100644 --- a/src/main/java/binnie/genetics/machine/acclimatiser/WindowAcclimatiser.java +++ b/src/main/java/binnie/genetics/machine/acclimatiser/WindowAcclimatiser.java @@ -2,14 +2,10 @@ package binnie.genetics.machine.acclimatiser; import binnie.core.AbstractMod; import binnie.core.craftgui.geometry.Position; -import binnie.core.craftgui.minecraft.control.ControlEnergyBar; -import binnie.core.craftgui.minecraft.control.ControlErrorState; -import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; -import binnie.core.craftgui.minecraft.control.ControlSlot; -import binnie.core.craftgui.minecraft.control.ControlSlotArray; +import binnie.core.craftgui.minecraft.control.*; import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.StandardTexture; -import binnie.extrabees.core.ExtraBeeTexture; +import binnie.extrabees.client.ExtraBeeTexture; import binnie.genetics.Genetics; import binnie.genetics.machine.craftgui.WindowMachine; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/binnie/genetics/machine/analyser/PackageAnalyser.java b/src/main/java/binnie/genetics/machine/analyser/PackageAnalyser.java index 1295e82a..618c6ad1 100644 --- a/src/main/java/binnie/genetics/machine/analyser/PackageAnalyser.java +++ b/src/main/java/binnie/genetics/machine/analyser/PackageAnalyser.java @@ -3,11 +3,7 @@ package binnie.genetics.machine.analyser; import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; -import binnie.core.machines.inventory.ComponentChargedSlots; -import binnie.core.machines.inventory.ComponentInventorySlots; -import binnie.core.machines.inventory.ComponentInventoryTransfer; -import binnie.core.machines.inventory.InventorySlot; -import binnie.core.machines.inventory.SlotValidator; +import binnie.core.machines.inventory.*; import binnie.core.machines.power.ComponentPowerReceptor; import binnie.genetics.core.GeneticsGUI; import binnie.genetics.core.GeneticsTexture; diff --git a/src/main/java/binnie/genetics/machine/analyser/WindowAnalyser.java b/src/main/java/binnie/genetics/machine/analyser/WindowAnalyser.java index d9a96cd2..f5abda9f 100644 --- a/src/main/java/binnie/genetics/machine/analyser/WindowAnalyser.java +++ b/src/main/java/binnie/genetics/machine/analyser/WindowAnalyser.java @@ -4,18 +4,11 @@ import binnie.core.AbstractMod; import binnie.core.craftgui.geometry.Position; import binnie.core.craftgui.minecraft.GUIIcon; import binnie.core.craftgui.minecraft.MinecraftGUI; -import binnie.core.craftgui.minecraft.control.ControlEnergyBar; -import binnie.core.craftgui.minecraft.control.ControlErrorState; -import binnie.core.craftgui.minecraft.control.ControlIconDisplay; -import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; -import binnie.core.craftgui.minecraft.control.ControlProgress; -import binnie.core.craftgui.minecraft.control.ControlSlot; -import binnie.core.craftgui.minecraft.control.ControlSlotArray; -import binnie.core.craftgui.minecraft.control.ControlSlotCharge; +import binnie.core.craftgui.minecraft.control.*; import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.core.craftgui.window.Panel; -import binnie.extrabees.core.ExtraBeeTexture; +import binnie.extrabees.client.ExtraBeeTexture; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; import binnie.genetics.machine.craftgui.WindowMachine; diff --git a/src/main/java/binnie/genetics/machine/craftgui/WindowMachine.java b/src/main/java/binnie/genetics/machine/craftgui/WindowMachine.java index 0d91b28b..16be4dc9 100644 --- a/src/main/java/binnie/genetics/machine/craftgui/WindowMachine.java +++ b/src/main/java/binnie/genetics/machine/craftgui/WindowMachine.java @@ -1,5 +1,6 @@ package binnie.genetics.machine.craftgui; +import binnie.core.craftgui.minecraft.Window; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraftforge.fml.relauncher.Side; @@ -7,8 +8,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; -import binnie.core.craftgui.minecraft.Window; - public abstract class WindowMachine extends Window { public WindowMachine(final int width, final int height, final EntityPlayer player, @Nullable final IInventory inventory, final Side side) { super(width, height, player, inventory, side); diff --git a/src/main/java/binnie/genetics/machine/genepool/PackageGenepool.java b/src/main/java/binnie/genetics/machine/genepool/PackageGenepool.java index 60696222..db2bc615 100644 --- a/src/main/java/binnie/genetics/machine/genepool/PackageGenepool.java +++ b/src/main/java/binnie/genetics/machine/genepool/PackageGenepool.java @@ -3,14 +3,7 @@ package binnie.genetics.machine.genepool; import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; -import binnie.core.machines.inventory.ComponentChargedSlots; -import binnie.core.machines.inventory.ComponentInventorySlots; -import binnie.core.machines.inventory.ComponentInventoryTransfer; -import binnie.core.machines.inventory.ComponentTankContainer; -import binnie.core.machines.inventory.InventorySlot; -import binnie.core.machines.inventory.SlotValidator; -import binnie.core.machines.inventory.TankSlot; -import binnie.core.machines.inventory.TankValidator; +import binnie.core.machines.inventory.*; import binnie.core.machines.power.ComponentPowerReceptor; import binnie.genetics.core.GeneticsGUI; import binnie.genetics.core.GeneticsTexture; diff --git a/src/main/java/binnie/genetics/machine/genepool/WindowGenepool.java b/src/main/java/binnie/genetics/machine/genepool/WindowGenepool.java index ebacbde9..909691dc 100644 --- a/src/main/java/binnie/genetics/machine/genepool/WindowGenepool.java +++ b/src/main/java/binnie/genetics/machine/genepool/WindowGenepool.java @@ -3,18 +3,10 @@ package binnie.genetics.machine.genepool; import binnie.core.AbstractMod; import binnie.core.craftgui.geometry.Position; import binnie.core.craftgui.minecraft.GUIIcon; -import binnie.core.craftgui.minecraft.control.ControlEnergyBar; -import binnie.core.craftgui.minecraft.control.ControlErrorState; -import binnie.core.craftgui.minecraft.control.ControlIconDisplay; -import binnie.core.craftgui.minecraft.control.ControlLiquidTank; -import binnie.core.craftgui.minecraft.control.ControlMachineProgress; -import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; -import binnie.core.craftgui.minecraft.control.ControlSlot; -import binnie.core.craftgui.minecraft.control.ControlSlotArray; -import binnie.core.craftgui.minecraft.control.ControlSlotCharge; +import binnie.core.craftgui.minecraft.control.*; import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.StandardTexture; -import binnie.extrabees.core.ExtraBeeTexture; +import binnie.extrabees.client.ExtraBeeTexture; import binnie.genetics.Genetics; import binnie.genetics.machine.craftgui.WindowMachine; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/binnie/genetics/machine/incubator/WindowIncubator.java b/src/main/java/binnie/genetics/machine/incubator/WindowIncubator.java index d1a4f88f..e971efe7 100644 --- a/src/main/java/binnie/genetics/machine/incubator/WindowIncubator.java +++ b/src/main/java/binnie/genetics/machine/incubator/WindowIncubator.java @@ -3,14 +3,7 @@ package binnie.genetics.machine.incubator; import binnie.core.AbstractMod; import binnie.core.craftgui.geometry.Position; import binnie.core.craftgui.minecraft.GUIIcon; -import binnie.core.craftgui.minecraft.control.ControlEnergyBar; -import binnie.core.craftgui.minecraft.control.ControlErrorState; -import binnie.core.craftgui.minecraft.control.ControlIconDisplay; -import binnie.core.craftgui.minecraft.control.ControlLiquidTank; -import binnie.core.craftgui.minecraft.control.ControlMachineProgress; -import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; -import binnie.core.craftgui.minecraft.control.ControlSlot; -import binnie.core.craftgui.minecraft.control.ControlSlotArray; +import binnie.core.craftgui.minecraft.control.*; import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.genetics.Genetics; diff --git a/src/main/java/binnie/genetics/machine/indexer/ComponentIndexerInventory.java b/src/main/java/binnie/genetics/machine/indexer/ComponentIndexerInventory.java index eaf0b358..c5687778 100644 --- a/src/main/java/binnie/genetics/machine/indexer/ComponentIndexerInventory.java +++ b/src/main/java/binnie/genetics/machine/indexer/ComponentIndexerInventory.java @@ -1,6 +1,5 @@ package binnie.genetics.machine.indexer; -import binnie.Binnie; import binnie.core.machines.Machine; import binnie.core.machines.inventory.ComponentInventory; import binnie.core.machines.inventory.SetList; @@ -9,14 +8,9 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextComponentString; import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; public abstract class ComponentIndexerInventory extends ComponentInventory implements IInventory { int indexerSize; diff --git a/src/main/java/binnie/genetics/machine/inoculator/PackageInoculator.java b/src/main/java/binnie/genetics/machine/inoculator/PackageInoculator.java index 605df4f0..f7b71aea 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/PackageInoculator.java +++ b/src/main/java/binnie/genetics/machine/inoculator/PackageInoculator.java @@ -5,12 +5,7 @@ import binnie.core.machines.IMachine; import binnie.core.machines.Machine; import binnie.core.machines.MachineUtil; import binnie.core.machines.TileEntityMachine; -import binnie.core.machines.inventory.ComponentInventorySlots; -import binnie.core.machines.inventory.ComponentInventoryTransfer; -import binnie.core.machines.inventory.ComponentTankContainer; -import binnie.core.machines.inventory.InventorySlot; -import binnie.core.machines.inventory.SlotValidator; -import binnie.core.machines.inventory.Validator; +import binnie.core.machines.inventory.*; import binnie.core.machines.power.ComponentPowerReceptor; import binnie.genetics.api.IItemSerum; import binnie.genetics.core.GeneticsGUI; diff --git a/src/main/java/binnie/genetics/machine/inoculator/WindowInoculator.java b/src/main/java/binnie/genetics/machine/inoculator/WindowInoculator.java index a5e23e5b..13f3a5e6 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/WindowInoculator.java +++ b/src/main/java/binnie/genetics/machine/inoculator/WindowInoculator.java @@ -5,14 +5,7 @@ import binnie.core.craftgui.geometry.CraftGUIUtil; import binnie.core.craftgui.geometry.Position; import binnie.core.craftgui.geometry.TextJustification; import binnie.core.craftgui.minecraft.GUIIcon; -import binnie.core.craftgui.minecraft.control.ControlEnergyBar; -import binnie.core.craftgui.minecraft.control.ControlErrorState; -import binnie.core.craftgui.minecraft.control.ControlIconDisplay; -import binnie.core.craftgui.minecraft.control.ControlLiquidTank; -import binnie.core.craftgui.minecraft.control.ControlMachineProgress; -import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; -import binnie.core.craftgui.minecraft.control.ControlSlot; -import binnie.core.craftgui.minecraft.control.ControlSlotArray; +import binnie.core.craftgui.minecraft.control.*; import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.genetics.Genetics; diff --git a/src/main/java/binnie/genetics/machine/isolator/IsolatorLogic.java b/src/main/java/binnie/genetics/machine/isolator/IsolatorLogic.java index a1cf6d66..0b4edb39 100644 --- a/src/main/java/binnie/genetics/machine/isolator/IsolatorLogic.java +++ b/src/main/java/binnie/genetics/machine/isolator/IsolatorLogic.java @@ -9,12 +9,7 @@ import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; import binnie.genetics.Genetics; import binnie.genetics.item.ItemSequence; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.IGenome; -import forestry.api.genetics.IIndividual; -import forestry.api.genetics.ISpeciesRoot; +import forestry.api.genetics.*; import net.minecraft.item.ItemStack; import java.util.Random; diff --git a/src/main/java/binnie/genetics/machine/isolator/PackageIsolator.java b/src/main/java/binnie/genetics/machine/isolator/PackageIsolator.java index e2c54ea3..d13e98b3 100644 --- a/src/main/java/binnie/genetics/machine/isolator/PackageIsolator.java +++ b/src/main/java/binnie/genetics/machine/isolator/PackageIsolator.java @@ -3,13 +3,7 @@ package binnie.genetics.machine.isolator; import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; -import binnie.core.machines.inventory.ComponentChargedSlots; -import binnie.core.machines.inventory.ComponentInventorySlots; -import binnie.core.machines.inventory.ComponentInventoryTransfer; -import binnie.core.machines.inventory.ComponentTankContainer; -import binnie.core.machines.inventory.InventorySlot; -import binnie.core.machines.inventory.SlotValidator; -import binnie.core.machines.inventory.TankValidator; +import binnie.core.machines.inventory.*; import binnie.core.machines.power.ComponentPowerReceptor; import binnie.genetics.core.GeneticsGUI; import binnie.genetics.core.GeneticsTexture; diff --git a/src/main/java/binnie/genetics/machine/isolator/WindowIsolator.java b/src/main/java/binnie/genetics/machine/isolator/WindowIsolator.java index 1ab7e6b9..27c899d9 100644 --- a/src/main/java/binnie/genetics/machine/isolator/WindowIsolator.java +++ b/src/main/java/binnie/genetics/machine/isolator/WindowIsolator.java @@ -3,18 +3,10 @@ package binnie.genetics.machine.isolator; import binnie.core.AbstractMod; import binnie.core.craftgui.geometry.Position; import binnie.core.craftgui.minecraft.GUIIcon; -import binnie.core.craftgui.minecraft.control.ControlEnergyBar; -import binnie.core.craftgui.minecraft.control.ControlErrorState; -import binnie.core.craftgui.minecraft.control.ControlIconDisplay; -import binnie.core.craftgui.minecraft.control.ControlLiquidTank; -import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; -import binnie.core.craftgui.minecraft.control.ControlProgress; -import binnie.core.craftgui.minecraft.control.ControlSlot; -import binnie.core.craftgui.minecraft.control.ControlSlotArray; -import binnie.core.craftgui.minecraft.control.ControlSlotCharge; +import binnie.core.craftgui.minecraft.control.*; import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.StandardTexture; -import binnie.extrabees.core.ExtraBeeTexture; +import binnie.extrabees.client.ExtraBeeTexture; import binnie.genetics.Genetics; import binnie.genetics.machine.craftgui.WindowMachine; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/binnie/genetics/machine/polymeriser/PackagePolymeriser.java b/src/main/java/binnie/genetics/machine/polymeriser/PackagePolymeriser.java index 95383aaa..0a02555d 100644 --- a/src/main/java/binnie/genetics/machine/polymeriser/PackagePolymeriser.java +++ b/src/main/java/binnie/genetics/machine/polymeriser/PackagePolymeriser.java @@ -3,13 +3,7 @@ package binnie.genetics.machine.polymeriser; import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; -import binnie.core.machines.inventory.ComponentChargedSlots; -import binnie.core.machines.inventory.ComponentInventorySlots; -import binnie.core.machines.inventory.ComponentInventoryTransfer; -import binnie.core.machines.inventory.ComponentTankContainer; -import binnie.core.machines.inventory.InventorySlot; -import binnie.core.machines.inventory.SlotValidator; -import binnie.core.machines.inventory.Validator; +import binnie.core.machines.inventory.*; import binnie.core.machines.power.ComponentPowerReceptor; import binnie.genetics.core.GeneticsGUI; import binnie.genetics.core.GeneticsTexture; diff --git a/src/main/java/binnie/genetics/machine/polymeriser/WindowPolymeriser.java b/src/main/java/binnie/genetics/machine/polymeriser/WindowPolymeriser.java index a13d5f54..e3da18a7 100644 --- a/src/main/java/binnie/genetics/machine/polymeriser/WindowPolymeriser.java +++ b/src/main/java/binnie/genetics/machine/polymeriser/WindowPolymeriser.java @@ -3,15 +3,7 @@ package binnie.genetics.machine.polymeriser; import binnie.core.AbstractMod; import binnie.core.craftgui.geometry.Position; import binnie.core.craftgui.minecraft.GUIIcon; -import binnie.core.craftgui.minecraft.control.ControlEnergyBar; -import binnie.core.craftgui.minecraft.control.ControlErrorState; -import binnie.core.craftgui.minecraft.control.ControlIconDisplay; -import binnie.core.craftgui.minecraft.control.ControlLiquidTank; -import binnie.core.craftgui.minecraft.control.ControlMachineProgress; -import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; -import binnie.core.craftgui.minecraft.control.ControlSlot; -import binnie.core.craftgui.minecraft.control.ControlSlotArray; -import binnie.core.craftgui.minecraft.control.ControlSlotCharge; +import binnie.core.craftgui.minecraft.control.*; import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.genetics.Genetics; diff --git a/src/main/java/binnie/genetics/machine/sequencer/PackageSequencer.java b/src/main/java/binnie/genetics/machine/sequencer/PackageSequencer.java index ea6715e7..e6d2259e 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/PackageSequencer.java +++ b/src/main/java/binnie/genetics/machine/sequencer/PackageSequencer.java @@ -4,11 +4,7 @@ import binnie.Binnie; import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; -import binnie.core.machines.inventory.ComponentChargedSlots; -import binnie.core.machines.inventory.ComponentInventorySlots; -import binnie.core.machines.inventory.ComponentInventoryTransfer; -import binnie.core.machines.inventory.InventorySlot; -import binnie.core.machines.inventory.SlotValidator; +import binnie.core.machines.inventory.*; import binnie.core.machines.power.ComponentPowerReceptor; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsGUI; diff --git a/src/main/java/binnie/genetics/machine/sequencer/WindowSequencer.java b/src/main/java/binnie/genetics/machine/sequencer/WindowSequencer.java index 499162a4..628fe8b5 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/WindowSequencer.java +++ b/src/main/java/binnie/genetics/machine/sequencer/WindowSequencer.java @@ -7,16 +7,10 @@ import binnie.core.craftgui.geometry.CraftGUIUtil; import binnie.core.craftgui.geometry.Position; import binnie.core.craftgui.geometry.TextJustification; import binnie.core.craftgui.minecraft.GUIIcon; -import binnie.core.craftgui.minecraft.control.ControlEnergyBar; -import binnie.core.craftgui.minecraft.control.ControlErrorState; -import binnie.core.craftgui.minecraft.control.ControlIconDisplay; -import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; -import binnie.core.craftgui.minecraft.control.ControlSlot; -import binnie.core.craftgui.minecraft.control.ControlSlotArray; -import binnie.core.craftgui.minecraft.control.ControlSlotCharge; +import binnie.core.craftgui.minecraft.control.*; import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.StandardTexture; -import binnie.extrabees.core.ExtraBeeTexture; +import binnie.extrabees.client.ExtraBeeTexture; import binnie.genetics.Genetics; import binnie.genetics.machine.craftgui.WindowMachine; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/binnie/genetics/machine/splicer/WindowSplicer.java b/src/main/java/binnie/genetics/machine/splicer/WindowSplicer.java index 2c1c4c5f..5fc0ddaa 100644 --- a/src/main/java/binnie/genetics/machine/splicer/WindowSplicer.java +++ b/src/main/java/binnie/genetics/machine/splicer/WindowSplicer.java @@ -5,12 +5,7 @@ import binnie.core.craftgui.geometry.CraftGUIUtil; import binnie.core.craftgui.geometry.Position; import binnie.core.craftgui.geometry.TextJustification; import binnie.core.craftgui.minecraft.GUIIcon; -import binnie.core.craftgui.minecraft.control.ControlEnergyBar; -import binnie.core.craftgui.minecraft.control.ControlErrorState; -import binnie.core.craftgui.minecraft.control.ControlIconDisplay; -import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; -import binnie.core.craftgui.minecraft.control.ControlSlot; -import binnie.core.craftgui.minecraft.control.ControlSlotArray; +import binnie.core.craftgui.minecraft.control.*; import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.genetics.Genetics;