From 0f67d73b306cbfe6bfeecb813101604b5661da6d Mon Sep 17 00:00:00 2001 From: Elec332 Date: Tue, 25 Oct 2016 15:13:44 +0200 Subject: [PATCH] Cleanup main mod classes, ran import optimiser --- src/main/java/binnie/botany/Botany.java | 27 +-- .../java/binnie/botany/api/EnumSoilType.java | 4 +- .../botany/api/IAlleleFlowerSpecies.java | 4 +- .../binnie/botany/api/IFlowerFactory.java | 4 +- .../java/binnie/botany/api/IFlowerType.java | 4 +- .../binnie/botany/ceramic/BlockCeramic.java | 2 - .../botany/ceramic/BlockCeramicBrick.java | 2 +- .../binnie/botany/ceramic/BlockStained.java | 4 - .../botany/ceramic/CeramicDesignSystem.java | 7 +- .../binnie/botany/flower/BlockFlower.java | 14 +- .../botany/flower/TileEntityFlower.java | 5 - .../binnie/botany/gardening/ItemTrowel.java | 6 +- .../botany/genetics/AlleleFlowerSpecies.java | 12 +- .../java/binnie/botany/genetics/Flower.java | 3 +- .../botany/genetics/FlowerDefinition.java | 5 +- .../binnie/botany/genetics/FlowerFactory.java | 6 +- .../botany/genetics/FlowerMutation.java | 6 +- .../binnie/botany/genetics/FlowerRoot.java | 1 - src/main/java/binnie/core/AbstractMod.java | 5 + src/main/java/binnie/core/BinnieCore.java | 192 +++++++++--------- .../java/binnie/core/block/ItemMetadata.java | 4 +- .../binnie/core/block/ModelMutlipass.java | 2 - .../core/genetics/FlowerBreedingSystem.java | 5 +- src/main/java/binnie/core/item/ItemMisc.java | 3 +- .../binnie/core/machines/ManagerMachine.java | 6 +- .../java/binnie/core/models/ModelManager.java | 25 +-- .../binnie/core/proxy/BinnieProxyClient.java | 2 - .../java/binnie/core/proxy/IProxyCore.java | 5 + src/main/java/binnie/core/util/TileUtil.java | 6 +- .../dictionary/ControlTileSelect.java | 6 +- .../dictionary/PageSpeciesTreeGenome.java | 1 + src/main/java/binnie/extrabees/ExtraBees.java | 20 +- .../binnie/extrabees/apiary/ModuleApiary.java | 1 - .../extrabees/apiary/TileExtraBeeAlveary.java | 1 - .../apiary/machine/AlvearyFrame.java | 5 +- .../apiary/machine/AlvearyMutator.java | 2 - .../binnie/extrabees/core/ModuleCore.java | 1 - .../genetics/effect/ExtraBeesEffect.java | 16 +- .../extrabees/products/ItemHoneyComb.java | 4 - .../extrabees/products/ItemProduct.java | 2 - .../java/binnie/extratrees/ExtraTrees.java | 70 +++---- .../extratrees/carpentry/BlockCarpentry.java | 2 - .../extratrees/carpentry/DesignSystem.java | 6 +- .../extratrees/genetics/ExtraTreeSpecies.java | 5 +- .../extratrees/genetics/WoodProvider.java | 4 +- .../binnie/extratrees/proxy/ProxyClient.java | 3 +- src/main/java/binnie/genetics/Genetics.java | 14 +- .../integration/jei/GeneticsJeiPlugin.java | 6 +- .../incubator/IncubatorRecipeCategory.java | 6 +- .../binnie/genetics/item/ItemSerumArray.java | 1 + 50 files changed, 243 insertions(+), 304 deletions(-) diff --git a/src/main/java/binnie/botany/Botany.java b/src/main/java/binnie/botany/Botany.java index 3364eb60..00bafd08 100644 --- a/src/main/java/binnie/botany/Botany.java +++ b/src/main/java/binnie/botany/Botany.java @@ -52,7 +52,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @Mod(modid = Constants.BOTANY_MOD_ID, name = "Binnie's Botany", useMetadata = true, dependencies = "required-after:" + Constants.CORE_MOD_ID) public class Botany extends AbstractMod { - public static final float AGE_CHANCE = 0.2f; + @Mod.Instance(Constants.BOTANY_MOD_ID) public static Botany instance; @SidedProxy(clientSide = "binnie.botany.proxy.ProxyClient", serverSide = "binnie.botany.proxy.ProxyServer") @@ -86,19 +86,16 @@ public class Botany extends AbstractMod { public static BlockStained stained; public static BlockCeramicBrick ceramicBrick; + public static final float AGE_CHANCE = 0.2f; + @Mod.EventHandler public void preInit(final FMLPreInitializationEvent evt) { - this.addModule(new ModuleCore()); - this.addModule(new ModuleGenetics()); - this.addModule(new ModuleGardening()); this.preInit(); - proxy.registerModels(); } @Mod.EventHandler public void init(final FMLInitializationEvent evt) { this.init(); - proxy.registerItemAndBlockColors(); } @Mod.EventHandler @@ -106,8 +103,11 @@ public class Botany extends AbstractMod { this.postInit(); } - public Botany() { - Botany.instance = this; + @Override + protected void registerModules() { + this.addModule(new ModuleCore()); + this.addModule(new ModuleGenetics()); + this.addModule(new ModuleGardening()); } @Override @@ -145,6 +145,11 @@ public class Botany extends AbstractMod { return PacketHandler.class; } + @Override + public boolean isActive() { + return BinnieCore.isBotanyActive(); + } + @SubscribeEvent public void onShearFlower(final PlayerInteractEvent.RightClickBlock event) { if (event.getEntityPlayer() != null && event.getEntityPlayer().getHeldItemMainhand() != null && event.getEntityPlayer().getHeldItemMainhand().getItem() == Items.SHEARS) { @@ -271,11 +276,6 @@ public class Botany extends AbstractMod { } } - @Override - public boolean isActive() { - return BinnieCore.isBotanyActive(); - } - @Mod.EventHandler public void onIMC(final FMLInterModComms.IMCEvent event) { for (final FMLInterModComms.IMCMessage message : event.getMessages()) { @@ -305,4 +305,5 @@ public class Botany extends AbstractMod { super(Botany.instance); } } + } diff --git a/src/main/java/binnie/botany/api/EnumSoilType.java b/src/main/java/binnie/botany/api/EnumSoilType.java index 411c4089..db29e075 100644 --- a/src/main/java/binnie/botany/api/EnumSoilType.java +++ b/src/main/java/binnie/botany/api/EnumSoilType.java @@ -1,11 +1,11 @@ package binnie.botany.api; -import java.util.Locale; - import net.minecraft.util.IStringSerializable; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; +import java.util.Locale; + public enum EnumSoilType implements IStringSerializable { SOIL(TextFormatting.DARK_GRAY), LOAM(TextFormatting.GOLD), diff --git a/src/main/java/binnie/botany/api/IAlleleFlowerSpecies.java b/src/main/java/binnie/botany/api/IAlleleFlowerSpecies.java index b5c04bfc..70f6e510 100644 --- a/src/main/java/binnie/botany/api/IAlleleFlowerSpecies.java +++ b/src/main/java/binnie/botany/api/IAlleleFlowerSpecies.java @@ -1,7 +1,5 @@ package binnie.botany.api; -import javax.annotation.Nonnull; - import forestry.api.core.IModelManager; import forestry.api.genetics.IAlleleSpecies; import net.minecraft.client.renderer.block.model.ModelResourceLocation; @@ -9,6 +7,8 @@ import net.minecraft.item.Item; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + public interface IAlleleFlowerSpecies extends IAlleleSpecies { IFlowerType getType(); diff --git a/src/main/java/binnie/botany/api/IFlowerFactory.java b/src/main/java/binnie/botany/api/IFlowerFactory.java index 81da5646..e54785e6 100644 --- a/src/main/java/binnie/botany/api/IFlowerFactory.java +++ b/src/main/java/binnie/botany/api/IFlowerFactory.java @@ -1,10 +1,10 @@ package binnie.botany.api; -import javax.annotation.Nonnull; - import forestry.api.genetics.IAllele; import forestry.api.genetics.IClassification; +import javax.annotation.Nonnull; + public interface IFlowerFactory { @Nonnull diff --git a/src/main/java/binnie/botany/api/IFlowerType.java b/src/main/java/binnie/botany/api/IFlowerType.java index f037f5ca..ec2e9713 100644 --- a/src/main/java/binnie/botany/api/IFlowerType.java +++ b/src/main/java/binnie/botany/api/IFlowerType.java @@ -1,13 +1,13 @@ package binnie.botany.api; -import javax.annotation.Nonnull; - import forestry.api.core.IModelManager; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.Item; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + //import net.minecraft.util.IIcon; public interface IFlowerType { diff --git a/src/main/java/binnie/botany/ceramic/BlockCeramic.java b/src/main/java/binnie/botany/ceramic/BlockCeramic.java index 9e29db9f..57d59e36 100644 --- a/src/main/java/binnie/botany/ceramic/BlockCeramic.java +++ b/src/main/java/binnie/botany/ceramic/BlockCeramic.java @@ -11,9 +11,7 @@ import forestry.core.blocks.IColoredBlock; import forestry.core.items.IColoredItem; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyEnum; -import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java b/src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java index 2ad95cbb..b39db428 100644 --- a/src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java +++ b/src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java @@ -3,9 +3,9 @@ package binnie.botany.ceramic; import binnie.Constants; import binnie.botany.Botany; import binnie.botany.CreativeTabBotany; +import binnie.botany.ceramic.BlockCeramicBrick.BlockType; import binnie.botany.genetics.EnumFlowerColor; import binnie.botany.items.BotanyItems; -import binnie.botany.ceramic.BlockCeramicBrick.BlockType; import binnie.core.block.BlockMetadata; import binnie.core.block.IBlockMetadata; import binnie.core.block.IMultipassBlock; diff --git a/src/main/java/binnie/botany/ceramic/BlockStained.java b/src/main/java/binnie/botany/ceramic/BlockStained.java index 73220a2e..dec8a911 100644 --- a/src/main/java/binnie/botany/ceramic/BlockStained.java +++ b/src/main/java/binnie/botany/ceramic/BlockStained.java @@ -7,7 +7,6 @@ import binnie.core.block.IBlockMetadata; import binnie.core.block.TileEntityMetadata; import binnie.extratrees.ExtraTrees; import forestry.core.blocks.IColoredBlock; -import forestry.core.items.IColoredItem; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -17,7 +16,6 @@ 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.math.BlockPos; import net.minecraft.util.math.RayTraceResult; @@ -29,8 +27,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; import java.util.List; import java.util.Random; -import org.apache.logging.log4j.core.net.Facility; - public class BlockStained extends Block implements IBlockMetadata, IColoredBlock { public BlockStained() { super(Material.GLASS); diff --git a/src/main/java/binnie/botany/ceramic/CeramicDesignSystem.java b/src/main/java/binnie/botany/ceramic/CeramicDesignSystem.java index b7b8be5d..6f858910 100644 --- a/src/main/java/binnie/botany/ceramic/CeramicDesignSystem.java +++ b/src/main/java/binnie/botany/ceramic/CeramicDesignSystem.java @@ -1,13 +1,9 @@ package binnie.botany.ceramic; -import java.util.HashMap; -import java.util.Map; - import binnie.botany.Botany; import binnie.botany.genetics.EnumFlowerColor; import binnie.botany.items.BotanyItems; import binnie.core.AbstractMod; -import binnie.core.BinnieCore; import binnie.extratrees.api.IDesignMaterial; import binnie.extratrees.api.IDesignSystem; import binnie.extratrees.api.IPattern; @@ -19,6 +15,9 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import java.util.HashMap; +import java.util.Map; + public class CeramicDesignSystem implements IDesignSystem { public static CeramicDesignSystem instance = new CeramicDesignSystem(); Map primary; diff --git a/src/main/java/binnie/botany/flower/BlockFlower.java b/src/main/java/binnie/botany/flower/BlockFlower.java index 7f4ac48d..9a73c58c 100644 --- a/src/main/java/binnie/botany/flower/BlockFlower.java +++ b/src/main/java/binnie/botany/flower/BlockFlower.java @@ -1,16 +1,11 @@ package binnie.botany.flower; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - -import com.mojang.authlib.GameProfile; - import binnie.botany.Botany; import binnie.botany.api.IFlower; import binnie.botany.core.BotanyCore; import binnie.botany.gardening.Gardening; import binnie.core.BinnieCore; +import com.mojang.authlib.GameProfile; import forestry.core.blocks.IColoredBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; @@ -29,6 +24,10 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; + public class BlockFlower extends BlockContainer implements /*IItemModelRegister, */IColoredBlock { public static final AxisAlignedBB FLOWER_BLOCK_AABB = new AxisAlignedBB(0.3D, 0.0D, 0.3D, 0.7D, 0.6D, 0.7D); @@ -112,7 +111,8 @@ public class BlockFlower extends BlockContainer implements /*IItemModelRegister, return (RendererBotany.pass == 0) ? flower.getStem(stage, flowered, section) : ((RendererBotany.pass == 1) ? flower.getPetalIcon(stage, flowered, section) : flower.getVariantIcon(stage, flowered, section)); } return super.getIcon(world, x, y, z, side); - }*/ + }*/ + @Override @SideOnly(Side.CLIENT) public int colorMultiplier(IBlockState state, IBlockAccess world, BlockPos pos, int tintIndex) { diff --git a/src/main/java/binnie/botany/flower/TileEntityFlower.java b/src/main/java/binnie/botany/flower/TileEntityFlower.java index cc972737..e607b899 100644 --- a/src/main/java/binnie/botany/flower/TileEntityFlower.java +++ b/src/main/java/binnie/botany/flower/TileEntityFlower.java @@ -15,12 +15,8 @@ import com.mojang.authlib.GameProfile; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.core.IErrorState; -import forestry.api.genetics.IIndividual; -import forestry.api.genetics.IPollinatable; import forestry.api.lepidopterology.IButterfly; -import forestry.api.lepidopterology.IButterflyNursery; import net.minecraft.block.Block; -import net.minecraft.block.BlockDoublePlant.EnumPlantType; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTUtil; @@ -28,7 +24,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraft.world.biome.Biome; -import java.util.EnumSet; import java.util.HashSet; import java.util.Random; import java.util.Set; diff --git a/src/main/java/binnie/botany/gardening/ItemTrowel.java b/src/main/java/binnie/botany/gardening/ItemTrowel.java index aeb14bd6..e51e64b8 100644 --- a/src/main/java/binnie/botany/gardening/ItemTrowel.java +++ b/src/main/java/binnie/botany/gardening/ItemTrowel.java @@ -16,11 +16,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; 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/genetics/AlleleFlowerSpecies.java b/src/main/java/binnie/botany/genetics/AlleleFlowerSpecies.java index 43462969..76ab8bed 100644 --- a/src/main/java/binnie/botany/genetics/AlleleFlowerSpecies.java +++ b/src/main/java/binnie/botany/genetics/AlleleFlowerSpecies.java @@ -1,14 +1,6 @@ package binnie.botany.genetics; -import javax.annotation.Nonnull; - -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; @@ -18,6 +10,8 @@ import forestry.core.genetics.alleles.AlleleSpecies; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.Item; +import javax.annotation.Nonnull; + public class AlleleFlowerSpecies extends AlleleSpecies implements IAlleleFlowerSpecies, IAlleleFlowerSpeciesBuilder { @Nonnull diff --git a/src/main/java/binnie/botany/genetics/Flower.java b/src/main/java/binnie/botany/genetics/Flower.java index c4d50d5e..919d73d4 100644 --- a/src/main/java/binnie/botany/genetics/Flower.java +++ b/src/main/java/binnie/botany/genetics/Flower.java @@ -11,11 +11,10 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import javax.annotation.Nonnull; import java.util.List; import java.util.Random; -import javax.annotation.Nonnull; - public class Flower extends Individual implements IFlower { public IFlowerGenome genome; public IFlowerGenome mate; diff --git a/src/main/java/binnie/botany/genetics/FlowerDefinition.java b/src/main/java/binnie/botany/genetics/FlowerDefinition.java index 0e63d6a5..72674e59 100644 --- a/src/main/java/binnie/botany/genetics/FlowerDefinition.java +++ b/src/main/java/binnie/botany/genetics/FlowerDefinition.java @@ -4,11 +4,14 @@ import binnie.Constants; import binnie.botany.api.*; import binnie.botany.core.BotanyCore; import forestry.api.core.EnumTemperature; -import forestry.api.genetics.*; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IClassification; import forestry.core.genetics.alleles.AlleleHelper; import forestry.core.genetics.alleles.EnumAllele; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/binnie/botany/genetics/FlowerFactory.java b/src/main/java/binnie/botany/genetics/FlowerFactory.java index 7c8c96b6..fed46572 100644 --- a/src/main/java/binnie/botany/genetics/FlowerFactory.java +++ b/src/main/java/binnie/botany/genetics/FlowerFactory.java @@ -1,10 +1,6 @@ package binnie.botany.genetics; -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 forestry.api.genetics.IAllele; import forestry.api.genetics.IClassification; diff --git a/src/main/java/binnie/botany/genetics/FlowerMutation.java b/src/main/java/binnie/botany/genetics/FlowerMutation.java index 134675db..adf24fb8 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 73c30569..dacd1cf1 100644 --- a/src/main/java/binnie/botany/genetics/FlowerRoot.java +++ b/src/main/java/binnie/botany/genetics/FlowerRoot.java @@ -3,7 +3,6 @@ package binnie.botany.genetics; import binnie.botany.Botany; import binnie.botany.api.*; import com.mojang.authlib.GameProfile; - import forestry.api.genetics.*; import forestry.core.genetics.SpeciesRoot; import net.minecraft.item.Item; diff --git a/src/main/java/binnie/core/AbstractMod.java b/src/main/java/binnie/core/AbstractMod.java index 7697b19c..720666ae 100644 --- a/src/main/java/binnie/core/AbstractMod.java +++ b/src/main/java/binnie/core/AbstractMod.java @@ -31,6 +31,8 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable { MinecraftForge.EVENT_BUS.register(this); } + protected abstract void registerModules(); + public abstract boolean isActive(); @Override @@ -64,6 +66,7 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable { if (!this.isActive()) { return; } + registerModules(); if (this.getConfigs() != null) { for (final Class cls : this.getConfigs()) { Binnie.Configuration.registerConfiguration(cls, this); @@ -87,6 +90,7 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable { throw new RuntimeException(e); } } + getProxy().registerModels(); } @Override @@ -107,6 +111,7 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable { throw new RuntimeException(e); } } + getProxy().registerItemAndBlockColors(); } @Override diff --git a/src/main/java/binnie/core/BinnieCore.java b/src/main/java/binnie/core/BinnieCore.java index b979e0db..07e06b72 100644 --- a/src/main/java/binnie/core/BinnieCore.java +++ b/src/main/java/binnie/core/BinnieCore.java @@ -48,6 +48,7 @@ import java.util.List; @Mod(modid = Constants.CORE_MOD_ID, name = "Binnie Core", useMetadata = true, dependencies = "required-after:forestry") public final class BinnieCore extends AbstractMod { + @Mod.Instance(Constants.CORE_MOD_ID) public static BinnieCore instance; @SidedProxy(clientSide = "binnie.core.proxy.BinnieProxyClient", serverSide = "binnie.core.proxy.BinnieProxyServer") @@ -61,6 +62,34 @@ public final class BinnieCore extends AbstractMod { @Mod.EventHandler public void preInit(final FMLPreInitializationEvent evt) { Binnie.Configuration.registerConfiguration(ConfigurationMods.class, this); + for (final FluidContainer container : FluidContainer.values()) { + final Item item = new ItemFluidContainer(container); + BinnieCore.proxy.registerItem(item); + } + //TODO REMOVE ITEMPARSER + FieldParser.parsers.add(new ItemParser()); + this.preInit(); + } + + @Mod.EventHandler + public void init(final FMLInitializationEvent evt) { + this.init(); + for (final AbstractMod mod : getActiveMods()) { + NetworkRegistry.INSTANCE.registerGuiHandler(mod, new BinnieGUIHandler(mod)); + } + //TODO RENDERING +// BinnieCore.multipassRenderID = RenderingRegistry.getNextAvailableRenderId(); +// RenderingRegistry.registerBlockHandler(new MultipassBlockRenderer()); + GameRegistry.registerTileEntity(TileEntityMetadata.class, "binnie.tile.metadata"); + } + + @Mod.EventHandler + public void postInit(final FMLPostInitializationEvent evt) { + this.postInit(); + } + + @Override + protected void registerModules() { for (final ManagerBase baseManager : Binnie.Managers) { this.addModule(baseManager); } @@ -70,19 +99,6 @@ public final class BinnieCore extends AbstractMod { if (Loader.isModLoaded("BuildCraft|Silicon")) { this.addModule(new ModuleTrigger()); } - this.preInit(); - proxy.registerModels(); - } - - @Mod.EventHandler - public void init(final FMLInitializationEvent evt) { - this.init(); - proxy.registerItemAndBlockColors(); - } - - @Mod.EventHandler - public void postInit(final FMLPostInitializationEvent evt) { - this.postInit(); } @Override @@ -91,29 +107,73 @@ public final class BinnieCore extends AbstractMod { } @Override - public void preInit() { - BinnieCore.instance = this; - for (final FluidContainer container : FluidContainer.values()) { - final Item item = new ItemFluidContainer(container); - BinnieCore.proxy.registerItem(item); - } - //TODO REMMOVE ITEMPARSER - FieldParser.parsers.add(new ItemParser()); - super.preInit(); + public String getChannel() { + return "BIN"; } @Override - public void init() { - super.init(); - for (final AbstractMod mod : getActiveMods()) { - NetworkRegistry.INSTANCE.registerGuiHandler(mod, new BinnieGUIHandler(mod)); - } - //TODO RENDERING -// BinnieCore.multipassRenderID = RenderingRegistry.getNextAvailableRenderId(); -// RenderingRegistry.registerBlockHandler(new MultipassBlockRenderer()); - GameRegistry.registerTileEntity(TileEntityMetadata.class, "binnie.tile.metadata"); + public IBinnieProxy getProxy() { + return BinnieCore.proxy; } + @Override + public String getModID() { + return "binniecore"; + } + + @Override + public IPacketID[] getPacketIDs() { + return BinnieCorePacketID.values(); + } + + @Override + public Class[] getConfigs() { + return new Class[]{ConfigurationMain.class}; + } + + @Override + protected Class getPacketHandler() { + return PacketHandler.class; + } + + @Override + public boolean isActive() { + return true; + } + + @SubscribeEvent + @SideOnly(Side.CLIENT) + public void handleSpeciesDiscovered(final ForestryEvent.SpeciesDiscovered event) { + try { + final EntityPlayerMP player = FMLCommonHandler.instance().getMinecraftServerInstance().getPlayerList().getPlayerByUUID(event.username.getId()); + if (player == null) { + return; + } + event.tracker.synchToPlayer(player); + final NBTTagCompound nbt = new NBTTagCompound(); + nbt.setString("species", event.species.getUID()); + } catch (Exception ex) { + } + } + + //TODO RENDERING + @SubscribeEvent + @SideOnly(Side.CLIENT) + public void handleTextureRemap(final TextureStitchEvent.Pre event) { +// if (event.map.getTextureType() == 0) { +// Binnie.Liquid.reloadIcons(event.map); +// } + Binnie.Resource.registerIcons(); + } + + public static class PacketHandler extends BinniePacketHandler { + public PacketHandler() { + super(BinnieCore.instance); + } + } + + //Module handling + public static boolean isLepidopteryActive() { return PluginManager.configDisabledPlugins.stream().noneMatch(e -> e instanceof forestry.lepidopterology.PluginLepidopterology); } @@ -142,11 +202,6 @@ public final class BinnieCore extends AbstractMod { return ConfigurationMods.extraTrees && isArboricultureActive(); } - @Override - public void postInit() { - super.postInit(); - } - static void registerMod(final AbstractMod mod) { BinnieCore.modList.add(mod); } @@ -161,69 +216,4 @@ public final class BinnieCore extends AbstractMod { return list; } - @SubscribeEvent - @SideOnly(Side.CLIENT) - public void handleSpeciesDiscovered(final ForestryEvent.SpeciesDiscovered event) { - try { - final EntityPlayerMP player = FMLCommonHandler.instance().getMinecraftServerInstance().getPlayerList().getPlayerByUUID(event.username.getId()); - if (player == null) { - return; - } - event.tracker.synchToPlayer(player); - final NBTTagCompound nbt = new NBTTagCompound(); - nbt.setString("species", event.species.getUID()); - } catch (Exception ex) { - } - } - - @Override - public String getChannel() { - return "BIN"; - } - - @Override - public IBinnieProxy getProxy() { - return BinnieCore.proxy; - } - - @Override - public String getModID() { - return "binniecore"; - } - - @Override - public IPacketID[] getPacketIDs() { - return BinnieCorePacketID.values(); - } - - //TODO RENDERING - @SubscribeEvent - @SideOnly(Side.CLIENT) - public void handleTextureRemap(final TextureStitchEvent.Pre event) { -// if (event.map.getTextureType() == 0) { -// Binnie.Liquid.reloadIcons(event.map); -// } - Binnie.Resource.registerIcons(); - } - - @Override - public Class[] getConfigs() { - return new Class[]{ConfigurationMain.class}; - } - - @Override - protected Class getPacketHandler() { - return PacketHandler.class; - } - - @Override - public boolean isActive() { - return true; - } - - public static class PacketHandler extends BinniePacketHandler { - public PacketHandler() { - super(BinnieCore.instance); - } - } } diff --git a/src/main/java/binnie/core/block/ItemMetadata.java b/src/main/java/binnie/core/block/ItemMetadata.java index 670e3cca..fc9d1083 100644 --- a/src/main/java/binnie/core/block/ItemMetadata.java +++ b/src/main/java/binnie/core/block/ItemMetadata.java @@ -1,7 +1,5 @@ package binnie.core.block; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -13,6 +11,8 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import java.util.List; + public class ItemMetadata extends ItemBlock { public ItemMetadata(final Block block) { super(block); diff --git a/src/main/java/binnie/core/block/ModelMutlipass.java b/src/main/java/binnie/core/block/ModelMutlipass.java index 08f27ad0..1b02d87e 100644 --- a/src/main/java/binnie/core/block/ModelMutlipass.java +++ b/src/main/java/binnie/core/block/ModelMutlipass.java @@ -1,8 +1,6 @@ package binnie.core.block; import forestry.api.core.IModelBaker; -import forestry.arboriculture.blocks.BlockForestryLeaves; -import forestry.arboriculture.models.ModelLeaves; import forestry.core.models.ModelBlockCached; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/binnie/core/genetics/FlowerBreedingSystem.java b/src/main/java/binnie/core/genetics/FlowerBreedingSystem.java index 4b73e00e..f3906851 100644 --- a/src/main/java/binnie/core/genetics/FlowerBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/FlowerBreedingSystem.java @@ -1,7 +1,10 @@ package binnie.core.genetics; import binnie.Binnie; -import binnie.botany.api.*; +import binnie.botany.api.EnumFlowerChromosome; +import binnie.botany.api.EnumFlowerStage; +import binnie.botany.api.IBotanistTracker; +import binnie.botany.api.IFlowerRoot; import binnie.botany.core.BotanyCore; import binnie.botany.genetics.EnumFlowerColor; import binnie.core.BinnieCore; diff --git a/src/main/java/binnie/core/item/ItemMisc.java b/src/main/java/binnie/core/item/ItemMisc.java index 882d0d39..fb9aff99 100644 --- a/src/main/java/binnie/core/item/ItemMisc.java +++ b/src/main/java/binnie/core/item/ItemMisc.java @@ -1,5 +1,6 @@ package binnie.core.item; +import forestry.api.core.IModelManager; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -10,8 +11,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; import java.util.List; import java.util.Locale; -import forestry.api.core.IModelManager; - public class ItemMisc extends ItemCore { private IItemMisc[] items; diff --git a/src/main/java/binnie/core/machines/ManagerMachine.java b/src/main/java/binnie/core/machines/ManagerMachine.java index 41904f9f..47745c00 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.ValidatorIcon; 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/models/ModelManager.java b/src/main/java/binnie/core/models/ModelManager.java index 9532666f..f6a8bceb 100644 --- a/src/main/java/binnie/core/models/ModelManager.java +++ b/src/main/java/binnie/core/models/ModelManager.java @@ -1,12 +1,13 @@ package binnie.core.models; import com.google.common.collect.ImmutableMap; - -import javax.annotation.Nonnull; -import javax.vecmath.Vector3f; -import java.util.ArrayList; -import java.util.List; - +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; +import forestry.api.core.IStateMapperRegister; +import forestry.core.blocks.IColoredBlock; +import forestry.core.items.IColoredItem; +import forestry.core.models.BlockModelEntry; +import forestry.core.models.ModelEntry; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -23,7 +24,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.util.registry.IRegistry; import net.minecraft.world.IBlockAccess; - import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.SimpleModelState; @@ -32,13 +32,10 @@ import net.minecraftforge.common.model.TRSRTransformation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import forestry.api.core.IItemModelRegister; -import forestry.api.core.IModelManager; -import forestry.api.core.IStateMapperRegister; -import forestry.core.blocks.IColoredBlock; -import forestry.core.items.IColoredItem; -import forestry.core.models.BlockModelEntry; -import forestry.core.models.ModelEntry; +import javax.annotation.Nonnull; +import javax.vecmath.Vector3f; +import java.util.ArrayList; +import java.util.List; @SideOnly(Side.CLIENT) public class ModelManager implements IModelManager { diff --git a/src/main/java/binnie/core/proxy/BinnieProxyClient.java b/src/main/java/binnie/core/proxy/BinnieProxyClient.java index cb4577ad..00126427 100644 --- a/src/main/java/binnie/core/proxy/BinnieProxyClient.java +++ b/src/main/java/binnie/core/proxy/BinnieProxyClient.java @@ -1,8 +1,6 @@ package binnie.core.proxy; import binnie.Constants; -import binnie.core.machines.RendererMachine; -import binnie.core.machines.TileEntityMachine; import binnie.core.models.ModelManager; import binnie.core.resource.BinnieResource; import binnie.craftgui.resource.minecraft.CraftGUIResourceManager; diff --git a/src/main/java/binnie/core/proxy/IProxyCore.java b/src/main/java/binnie/core/proxy/IProxyCore.java index 8449e9cd..8a255aee 100644 --- a/src/main/java/binnie/core/proxy/IProxyCore.java +++ b/src/main/java/binnie/core/proxy/IProxyCore.java @@ -9,4 +9,9 @@ public interface IProxyCore extends IInitializable { Item registerItem(Item item); Block registerBlock(Block block); + + public void registerModels(); + + public void registerItemAndBlockColors(); + } diff --git a/src/main/java/binnie/core/util/TileUtil.java b/src/main/java/binnie/core/util/TileUtil.java index f9131403..c57ab2b3 100644 --- a/src/main/java/binnie/core/util/TileUtil.java +++ b/src/main/java/binnie/core/util/TileUtil.java @@ -1,8 +1,5 @@ package binnie.core.util; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; @@ -10,6 +7,9 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.capabilities.Capability; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + public class TileUtil { @Nullable public static T getTile(@Nonnull IBlockAccess world, @Nonnull BlockPos pos, @Nonnull Class tileClass) { diff --git a/src/main/java/binnie/craftgui/extratrees/dictionary/ControlTileSelect.java b/src/main/java/binnie/craftgui/extratrees/dictionary/ControlTileSelect.java index ddb7fcae..108da59b 100644 --- a/src/main/java/binnie/craftgui/extratrees/dictionary/ControlTileSelect.java +++ b/src/main/java/binnie/craftgui/extratrees/dictionary/ControlTileSelect.java @@ -20,11 +20,7 @@ import binnie.extratrees.machines.Designer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -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/craftgui/extratrees/dictionary/PageSpeciesTreeGenome.java b/src/main/java/binnie/craftgui/extratrees/dictionary/PageSpeciesTreeGenome.java index ef16eab6..396bc2dd 100644 --- a/src/main/java/binnie/craftgui/extratrees/dictionary/PageSpeciesTreeGenome.java +++ b/src/main/java/binnie/craftgui/extratrees/dictionary/PageSpeciesTreeGenome.java @@ -22,6 +22,7 @@ import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleSpecies; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; + import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/binnie/extrabees/ExtraBees.java b/src/main/java/binnie/extrabees/ExtraBees.java index ff3c88af..74a78efb 100644 --- a/src/main/java/binnie/extrabees/ExtraBees.java +++ b/src/main/java/binnie/extrabees/ExtraBees.java @@ -26,6 +26,7 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; @Mod(modid = Constants.EXTRA_BEES_MOD_ID, name = "Binnie's Extra Bees", useMetadata = true, dependencies = "required-after:" + Constants.CORE_MOD_ID) public class ExtraBees extends AbstractMod { + @Mod.Instance(Constants.EXTRA_BEES_MOD_ID) public static ExtraBees instance; @SidedProxy(clientSide = "binnie.extrabees.proxy.ExtraBeesProxyClient", serverSide = "binnie.extrabees.proxy.ExtraBeesProxyServer") @@ -46,20 +47,12 @@ public class ExtraBees extends AbstractMod { @Mod.EventHandler public void preInit(final FMLPreInitializationEvent evt) { - this.addModule(new ModuleCore()); - this.addModule(new ModuleProducts()); - this.addModule(new ModuleGenetics()); - //this.addModule(new ModuleGeneration()); - this.addModule(new ModuleLiquids()); - this.addModule(new ModuleApiary()); this.preInit(); - proxy.registerModels(); } @Mod.EventHandler public void init(final FMLInitializationEvent evt) { this.init(); - proxy.registerItemAndBlockColors(); } @Mod.EventHandler @@ -67,8 +60,14 @@ public class ExtraBees extends AbstractMod { this.postInit(); } - public ExtraBees() { - ExtraBees.instance = this; + @Override + protected void registerModules() { + this.addModule(new ModuleCore()); + this.addModule(new ModuleProducts()); + this.addModule(new ModuleGenetics()); + //this.addModule(new ModuleGeneration()); + this.addModule(new ModuleLiquids()); + this.addModule(new ModuleApiary()); } @Override @@ -111,4 +110,5 @@ public class ExtraBees extends AbstractMod { super(ExtraBees.instance); } } + } diff --git a/src/main/java/binnie/extrabees/apiary/ModuleApiary.java b/src/main/java/binnie/extrabees/apiary/ModuleApiary.java index a19a3c22..d10bd6ee 100644 --- a/src/main/java/binnie/extrabees/apiary/ModuleApiary.java +++ b/src/main/java/binnie/extrabees/apiary/ModuleApiary.java @@ -13,7 +13,6 @@ import binnie.extrabees.apiary.machine.AlvearyStimulator; import forestry.api.core.Tabs; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; diff --git a/src/main/java/binnie/extrabees/apiary/TileExtraBeeAlveary.java b/src/main/java/binnie/extrabees/apiary/TileExtraBeeAlveary.java index c78405a8..0f897e81 100644 --- a/src/main/java/binnie/extrabees/apiary/TileExtraBeeAlveary.java +++ b/src/main/java/binnie/extrabees/apiary/TileExtraBeeAlveary.java @@ -1,6 +1,5 @@ package binnie.extrabees.apiary; -import binnie.core.BinnieCore; import binnie.core.machines.TileEntityMachine; import binnie.extrabees.apiary.machine.AlvearyMachine; import com.mojang.authlib.GameProfile; diff --git a/src/main/java/binnie/extrabees/apiary/machine/AlvearyFrame.java b/src/main/java/binnie/extrabees/apiary/machine/AlvearyFrame.java index 8d39e173..bd73128f 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/AlvearyFrame.java +++ b/src/main/java/binnie/extrabees/apiary/machine/AlvearyFrame.java @@ -10,7 +10,10 @@ import binnie.extrabees.apiary.ComponentExtraBeeGUI; import binnie.extrabees.apiary.TileExtraBeeAlveary; import binnie.extrabees.core.ExtraBeeGUID; import binnie.extrabees.core.ExtraBeeTexture; -import forestry.api.apiculture.*; +import forestry.api.apiculture.IBeeGenome; +import forestry.api.apiculture.IBeeListener; +import forestry.api.apiculture.IBeeModifier; +import forestry.api.apiculture.IHiveFrame; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/src/main/java/binnie/extrabees/apiary/machine/AlvearyMutator.java b/src/main/java/binnie/extrabees/apiary/machine/AlvearyMutator.java index c6786632..4ce93922 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/AlvearyMutator.java +++ b/src/main/java/binnie/extrabees/apiary/machine/AlvearyMutator.java @@ -1,11 +1,9 @@ package binnie.extrabees.apiary.machine; -import binnie.core.BinnieCore; import binnie.core.machines.Machine; import binnie.core.machines.inventory.ComponentInventorySlots; import binnie.core.machines.inventory.SlotValidator; import binnie.core.machines.inventory.ValidatorIcon; -import binnie.core.proxy.BinnieProxy; import binnie.craftgui.minecraft.IMachineInformation; import binnie.extrabees.ExtraBees; import binnie.extrabees.apiary.ComponentBeeModifier; diff --git a/src/main/java/binnie/extrabees/core/ModuleCore.java b/src/main/java/binnie/extrabees/core/ModuleCore.java index 5f3ce483..e6940979 100644 --- a/src/main/java/binnie/extrabees/core/ModuleCore.java +++ b/src/main/java/binnie/extrabees/core/ModuleCore.java @@ -3,7 +3,6 @@ package binnie.extrabees.core; import binnie.Binnie; import binnie.core.IInitializable; import binnie.extrabees.ExtraBees; -import binnie.genetics.Genetics; import forestry.api.core.Tabs; public class ModuleCore implements IInitializable { diff --git a/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java b/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java index 4d782a2b..b1eeeae1 100644 --- a/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java +++ b/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java @@ -1,19 +1,10 @@ package binnie.extrabees.genetics.effect; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Collections; -import java.util.List; - import binnie.Binnie; import binnie.core.util.TileUtil; import binnie.extrabees.ExtraBees; import binnie.extrabees.genetics.ExtraBeesFlowers; -import forestry.api.apiculture.BeeManager; -import forestry.api.apiculture.IAlleleBeeEffect; -import forestry.api.apiculture.IArmorApiarist; -import forestry.api.apiculture.IBeeGenome; -import forestry.api.apiculture.IBeeHousing; +import forestry.api.apiculture.*; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IEffectData; import forestry.core.proxy.Proxies; @@ -43,6 +34,11 @@ import net.minecraft.world.WorldServer; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Collections; +import java.util.List; + public enum ExtraBeesEffect implements IAlleleBeeEffect { ECTOPLASM, ACID, diff --git a/src/main/java/binnie/extrabees/products/ItemHoneyComb.java b/src/main/java/binnie/extrabees/products/ItemHoneyComb.java index d8ab1e0b..82c5cd83 100644 --- a/src/main/java/binnie/extrabees/products/ItemHoneyComb.java +++ b/src/main/java/binnie/extrabees/products/ItemHoneyComb.java @@ -3,19 +3,15 @@ package binnie.extrabees.products; import binnie.core.Mods; import binnie.extrabees.ExtraBees; import binnie.extrabees.core.ExtraBeeItems; -import forestry.api.core.IModelManager; import forestry.api.core.Tabs; import forestry.core.items.IColoredItem; import net.minecraft.init.Blocks; import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.OreDictionary; -import java.util.Locale; - public class ItemHoneyComb extends ItemProduct implements IColoredItem { public ItemHoneyComb() { diff --git a/src/main/java/binnie/extrabees/products/ItemProduct.java b/src/main/java/binnie/extrabees/products/ItemProduct.java index 4f3c1801..d00e1413 100644 --- a/src/main/java/binnie/extrabees/products/ItemProduct.java +++ b/src/main/java/binnie/extrabees/products/ItemProduct.java @@ -1,7 +1,6 @@ package binnie.extrabees.products; import binnie.core.item.IItemEnum; -import binnie.core.item.IItemMisc; import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; import net.minecraft.creativetab.CreativeTabs; @@ -9,7 +8,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import java.util.List; -import java.util.Locale; public class ItemProduct extends Item implements IItemModelRegister { IItemEnum[] types; diff --git a/src/main/java/binnie/extratrees/ExtraTrees.java b/src/main/java/binnie/extratrees/ExtraTrees.java index b7f70101..48c9649a 100644 --- a/src/main/java/binnie/extratrees/ExtraTrees.java +++ b/src/main/java/binnie/extratrees/ExtraTrees.java @@ -42,11 +42,9 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @Mod(modid = Constants.EXTRA_TREES_MOD_ID, name = "Binnie's Extra Trees", useMetadata = true, dependencies = "required-after:" + Constants.CORE_MOD_ID) public class ExtraTrees extends AbstractMod { + @Mod.Instance(Constants.EXTRA_TREES_MOD_ID) public static ExtraTrees instance; - public static final String MOD_ID = "extratrees"; - - @SidedProxy(clientSide = "binnie.extratrees.proxy.ProxyClient", serverSide = "binnie.extratrees.proxy.ProxyServer") public static Proxy proxy; public static Item itemDictionary; @@ -80,46 +78,18 @@ public class ExtraTrees extends AbstractMod { public static int stairsID; @Mod.EventHandler - public void preInit(final FMLPreInitializationEvent evt) { - this.addModule(new ModuleBlocks()); - this.addModule(new ModuleItems()); - this.addModule(new ModuleAlcohol()); - this.addModule(new ModuleGenetics()); - this.addModule(new ModuleCarpentry()); - this.addModule(new ModuleMachine()); - this.addModule(new ModuleCore()); - this.preInit(); - proxy.registerModels(); - } - - @Mod.EventHandler - public void pre(FMLConstructionEvent e) { + public void onConstruction(FMLConstructionEvent e) { MinecraftForge.EVENT_BUS.register(this); } - @SubscribeEvent - public void speciesRegister(AlleleSpeciesRegisterEvent event) { - if (event.getRoot() instanceof ITreeRoot) { - for (final ExtraTreeFruitGene fruit : ExtraTreeFruitGene.values()) { - AlleleManager.alleleRegistry.registerAllele(fruit); - } - for (final ExtraTreeSpecies species : ExtraTreeSpecies.values()) { - AlleleManager.alleleRegistry.registerAllele(species, EnumTreeChromosome.SPECIES); - } - } - - if (BinnieCore.isLepidopteryActive()) { - for (final ButterflySpecies species2 : ButterflySpecies.values()) { - AlleleManager.alleleRegistry.registerAllele(species2); - } - } + @Mod.EventHandler + public void preInit(final FMLPreInitializationEvent evt) { + this.preInit(); } - @Mod.EventHandler public void init(final FMLInitializationEvent evt) { this.init(); - proxy.registerItemAndBlockColors(); } @Mod.EventHandler @@ -127,8 +97,15 @@ public class ExtraTrees extends AbstractMod { this.postInit(); } - public ExtraTrees() { - ExtraTrees.instance = this; + @Override + protected void registerModules() { + this.addModule(new ModuleBlocks()); + this.addModule(new ModuleItems()); + this.addModule(new ModuleAlcohol()); + this.addModule(new ModuleGenetics()); + this.addModule(new ModuleCarpentry()); + this.addModule(new ModuleMachine()); + this.addModule(new ModuleCore()); } @Override @@ -166,9 +143,28 @@ public class ExtraTrees extends AbstractMod { return BinnieCore.isExtraTreesActive(); } + @SubscribeEvent + public void speciesRegister(AlleleSpeciesRegisterEvent event) { + if (event.getRoot() instanceof ITreeRoot) { + for (final ExtraTreeFruitGene fruit : ExtraTreeFruitGene.values()) { + AlleleManager.alleleRegistry.registerAllele(fruit); + } + for (final ExtraTreeSpecies species : ExtraTreeSpecies.values()) { + AlleleManager.alleleRegistry.registerAllele(species, EnumTreeChromosome.SPECIES); + } + } + + if (BinnieCore.isLepidopteryActive()) { + for (final ButterflySpecies species2 : ButterflySpecies.values()) { + AlleleManager.alleleRegistry.registerAllele(species2); + } + } + } + public static class PacketHandler extends BinniePacketHandler { public PacketHandler() { super(ExtraBees.instance); } } + } diff --git a/src/main/java/binnie/extratrees/carpentry/BlockCarpentry.java b/src/main/java/binnie/extratrees/carpentry/BlockCarpentry.java index 97676a58..da3222ea 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockCarpentry.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockCarpentry.java @@ -7,8 +7,6 @@ import binnie.extratrees.block.PlankType; import forestry.api.core.Tabs; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.item.ItemStack; public class BlockCarpentry extends BlockDesign { diff --git a/src/main/java/binnie/extratrees/carpentry/DesignSystem.java b/src/main/java/binnie/extratrees/carpentry/DesignSystem.java index b904db2a..81aadbc8 100644 --- a/src/main/java/binnie/extratrees/carpentry/DesignSystem.java +++ b/src/main/java/binnie/extratrees/carpentry/DesignSystem.java @@ -1,8 +1,5 @@ package binnie.extratrees.carpentry; -import java.util.HashMap; -import java.util.Map; - import binnie.core.AbstractMod; import binnie.extratrees.ExtraTrees; import binnie.extratrees.api.CarpentryManager; @@ -16,6 +13,9 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import java.util.HashMap; +import java.util.Map; + public enum DesignSystem implements IDesignSystem { Wood, Glass; diff --git a/src/main/java/binnie/extratrees/genetics/ExtraTreeSpecies.java b/src/main/java/binnie/extratrees/genetics/ExtraTreeSpecies.java index 41b13634..8e9434fb 100644 --- a/src/main/java/binnie/extratrees/genetics/ExtraTreeSpecies.java +++ b/src/main/java/binnie/extratrees/genetics/ExtraTreeSpecies.java @@ -1,6 +1,7 @@ package binnie.extratrees.genetics; import binnie.Binnie; +import binnie.Constants; import binnie.core.Mods; import binnie.core.genetics.ForestryAllele; import binnie.extratrees.ExtraTrees; @@ -1063,11 +1064,11 @@ public class ExtraTreeSpecies implements IAlleleTreeSpecies//, IIconProvider, IG Shrub; public ModelResourceLocation getModelLocation(ExtraTreeSpecies species) { - return new ModelResourceLocation(ExtraTrees.MOD_ID + ":saplings/tree" + name()); + return new ModelResourceLocation(Constants.EXTRA_TREES_MOD_ID + ":saplings/tree" + name()); } public ResourceLocation getResourceLocation(ExtraTreeSpecies species) { - return new ResourceLocation(ExtraTrees.MOD_ID + ":saplings/tree" + name()); + return new ResourceLocation(Constants.EXTRA_TREES_MOD_ID + ":saplings/tree" + name()); } //IIcon[] icon; } diff --git a/src/main/java/binnie/extratrees/genetics/WoodProvider.java b/src/main/java/binnie/extratrees/genetics/WoodProvider.java index 49ff3202..6df0c2bd 100644 --- a/src/main/java/binnie/extratrees/genetics/WoodProvider.java +++ b/src/main/java/binnie/extratrees/genetics/WoodProvider.java @@ -1,6 +1,6 @@ package binnie.extratrees.genetics; -import binnie.extratrees.ExtraTrees; +import binnie.Constants; import binnie.extratrees.block.EnumExtraTreeLog; import forestry.api.arboriculture.*; import forestry.api.core.ITextureManager; @@ -23,7 +23,7 @@ public class WoodProvider implements IWoodProvider { public WoodProvider(IWoodType type) { this.type = type; if (type instanceof EnumExtraTreeLog) { - modID = ExtraTrees.MOD_ID; + modID = Constants.EXTRA_TREES_MOD_ID; } else if (type instanceof EnumVanillaWoodType) { modID = "minecraft"; } else if (type instanceof EnumForestryWoodType) { diff --git a/src/main/java/binnie/extratrees/proxy/ProxyClient.java b/src/main/java/binnie/extratrees/proxy/ProxyClient.java index b6b6475d..64e5c77b 100644 --- a/src/main/java/binnie/extratrees/proxy/ProxyClient.java +++ b/src/main/java/binnie/extratrees/proxy/ProxyClient.java @@ -2,7 +2,6 @@ package binnie.extratrees.proxy; import binnie.Constants; import binnie.core.models.ModelManager; -import binnie.extratrees.ExtraTrees; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; @@ -29,7 +28,7 @@ public class ProxyClient extends Proxy implements IExtraTreeProxy { ResourceLocation rl; public CustomMapper(String name) { - rl = new ResourceLocation(ExtraTrees.MOD_ID, name); + rl = new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, name); } @Override diff --git a/src/main/java/binnie/genetics/Genetics.java b/src/main/java/binnie/genetics/Genetics.java index 87f23a82..42d746ca 100644 --- a/src/main/java/binnie/genetics/Genetics.java +++ b/src/main/java/binnie/genetics/Genetics.java @@ -25,7 +25,7 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; @Mod(modid = Constants.GENETICS_MOD_ID, name = "Binnie's Genetics", useMetadata = true, dependencies = "required-after:" + Constants.CORE_MOD_ID) public class Genetics extends AbstractMod { - public static ItemSerumArray itemSerumArray = null; + @Mod.Instance(Constants.GENETICS_MOD_ID) public static Genetics instance; @SidedProxy(clientSide = "binnie.genetics.proxy.ProxyClient", serverSide = "binnie.genetics.proxy.ProxyServer") @@ -41,19 +41,16 @@ public class Genetics extends AbstractMod { public static ItemAnalyst analyst; public static Item registry; public static Item masterRegistry; + public static ItemSerumArray itemSerumArray = null; @Mod.EventHandler public void preInit(final FMLPreInitializationEvent evt) { - this.addModule(new ModuleItem()); - this.addModule(new ModuleMachine()); this.preInit(); - proxy.registerModels(); } @Mod.EventHandler public void init(final FMLInitializationEvent evt) { this.init(); - proxy.registerItemAndBlockColors(); } @Mod.EventHandler @@ -61,8 +58,10 @@ public class Genetics extends AbstractMod { this.postInit(); } - public Genetics() { - Genetics.instance = this; + @Override + protected void registerModules() { + this.addModule(new ModuleItem()); + this.addModule(new ModuleMachine()); } @Override @@ -105,4 +104,5 @@ public class Genetics extends AbstractMod { super(Genetics.instance); } } + } diff --git a/src/main/java/binnie/genetics/integration/jei/GeneticsJeiPlugin.java b/src/main/java/binnie/genetics/integration/jei/GeneticsJeiPlugin.java index cfa00534..80ad7981 100644 --- a/src/main/java/binnie/genetics/integration/jei/GeneticsJeiPlugin.java +++ b/src/main/java/binnie/genetics/integration/jei/GeneticsJeiPlugin.java @@ -3,11 +3,7 @@ package binnie.genetics.integration.jei; import binnie.genetics.integration.jei.incubator.IncubatorRecipeCategory; import binnie.genetics.integration.jei.incubator.IncubatorRecipeHandler; import binnie.genetics.machine.Incubator; -import mezz.jei.api.BlankModPlugin; -import mezz.jei.api.IGuiHelper; -import mezz.jei.api.IJeiHelpers; -import mezz.jei.api.IModRegistry; -import mezz.jei.api.JEIPlugin; +import mezz.jei.api.*; @JEIPlugin public class GeneticsJeiPlugin extends BlankModPlugin { 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 4478d69b..7135e299 100644 --- a/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeCategory.java +++ b/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeCategory.java @@ -1,21 +1,21 @@ package binnie.genetics.integration.jei.incubator; -import javax.annotation.Nonnull; - import binnie.genetics.integration.jei.GeneticsJeiPlugin; import binnie.genetics.integration.jei.RecipeUids; import binnie.genetics.machine.Incubator; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IDrawableAnimated; -import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.gui.IDrawableAnimated.StartDirection; import mezz.jei.api.gui.IDrawableStatic; +import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeCategory; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; import net.minecraft.util.ResourceLocation; +import javax.annotation.Nonnull; + public class IncubatorRecipeCategory extends BlankRecipeCategory { @Nonnull diff --git a/src/main/java/binnie/genetics/item/ItemSerumArray.java b/src/main/java/binnie/genetics/item/ItemSerumArray.java index cb892fec..587a94ac 100644 --- a/src/main/java/binnie/genetics/item/ItemSerumArray.java +++ b/src/main/java/binnie/genetics/item/ItemSerumArray.java @@ -14,6 +14,7 @@ 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; public class ItemSerumArray extends ItemGene implements IItemSerum {