diff --git a/src/main/java/binnie/Constants.java b/src/main/java/binnie/Constants.java index 23150f81..51665a2d 100644 --- a/src/main/java/binnie/Constants.java +++ b/src/main/java/binnie/Constants.java @@ -2,6 +2,10 @@ 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_BEES_MOD_ID = "extrabees"; + public static final String EXTRA_TREES_MOD_ID = "extratrees"; + public static final String GENETICS_MOD_ID = "genetics"; public static final String LiquidJuice = "juice"; public static final String LiquidWater = "water"; diff --git a/src/main/java/binnie/botany/gardening/ModuleGardening.java b/src/main/java/binnie/botany/gardening/ModuleGardening.java index b2a2ff48..5e041ada 100644 --- a/src/main/java/binnie/botany/gardening/ModuleGardening.java +++ b/src/main/java/binnie/botany/gardening/ModuleGardening.java @@ -13,7 +13,6 @@ import binnie.botany.genetics.EnumFlowerColor; import binnie.botany.items.BotanyItems; import binnie.botany.items.ItemClay; import binnie.botany.items.ItemPigment; -import binnie.core.BinnieCore; import binnie.core.IInitializable; import binnie.core.Mods; import binnie.core.block.ItemMetadata; diff --git a/src/main/java/binnie/botany/proxy/ProxyClient.java b/src/main/java/binnie/botany/proxy/ProxyClient.java index 57d014ec..7fd2a7a4 100644 --- a/src/main/java/binnie/botany/proxy/ProxyClient.java +++ b/src/main/java/binnie/botany/proxy/ProxyClient.java @@ -1,11 +1,12 @@ package binnie.botany.proxy; +import binnie.Constants; import binnie.core.models.ModelManager; import net.minecraft.block.Block; import net.minecraft.item.Item; public class ProxyClient extends Proxy implements IBotanyProxy { - public static ModelManager modelManager = new ModelManager(); + public static ModelManager modelManager = new ModelManager(Constants.BOTANY_MOD_ID); public static ModelManager getModelManager() { return modelManager; diff --git a/src/main/java/binnie/core/item/ItemFieldKit.java b/src/main/java/binnie/core/item/ItemFieldKit.java index fec6d0d7..2c4ef871 100644 --- a/src/main/java/binnie/core/item/ItemFieldKit.java +++ b/src/main/java/binnie/core/item/ItemFieldKit.java @@ -4,7 +4,6 @@ import binnie.core.BinnieCore; import binnie.core.gui.BinnieCoreGUI; 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.ActionResult; import net.minecraft.util.EnumHand; diff --git a/src/main/java/binnie/core/item/ItemGenesis.java b/src/main/java/binnie/core/item/ItemGenesis.java index c404f262..194196f4 100644 --- a/src/main/java/binnie/core/item/ItemGenesis.java +++ b/src/main/java/binnie/core/item/ItemGenesis.java @@ -4,7 +4,6 @@ import binnie.core.BinnieCore; import binnie.core.gui.BinnieCoreGUI; import forestry.api.core.Tabs; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumHand; diff --git a/src/main/java/binnie/core/item/ItemMisc.java b/src/main/java/binnie/core/item/ItemMisc.java index 2200f8ec..01f29f9b 100644 --- a/src/main/java/binnie/core/item/ItemMisc.java +++ b/src/main/java/binnie/core/item/ItemMisc.java @@ -1,6 +1,5 @@ package binnie.core.item; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -11,9 +10,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; import java.util.List; import java.util.Locale; -import binnie.core.BinnieCore; -import binnie.genetics.Genetics; -import binnie.genetics.item.GeneticsItems; import forestry.api.core.IModelManager; public class ItemMisc extends ItemCore { diff --git a/src/main/java/binnie/core/mod/parser/ItemParser.java b/src/main/java/binnie/core/mod/parser/ItemParser.java index 91f33782..12a61761 100644 --- a/src/main/java/binnie/core/mod/parser/ItemParser.java +++ b/src/main/java/binnie/core/mod/parser/ItemParser.java @@ -3,8 +3,6 @@ package binnie.core.mod.parser; import binnie.core.AbstractMod; import binnie.core.BinnieCore; import net.minecraft.item.Item; -import net.minecraftforge.fml.common.registry.GameRegistry; - import java.lang.reflect.Field; public class ItemParser extends FieldParser { diff --git a/src/main/java/binnie/core/models/ModelManager.java b/src/main/java/binnie/core/models/ModelManager.java index d2832085..9532666f 100644 --- a/src/main/java/binnie/core/models/ModelManager.java +++ b/src/main/java/binnie/core/models/ModelManager.java @@ -2,8 +2,6 @@ package binnie.core.models; import com.google.common.collect.ImmutableMap; -import binnie.Constants; - import javax.annotation.Nonnull; import javax.vecmath.Vector3f; import java.util.ArrayList; @@ -34,7 +32,6 @@ import net.minecraftforge.common.model.TRSRTransformation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import forestry.api.core.ForestryAPI; import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; import forestry.api.core.IStateMapperRegister; @@ -42,11 +39,12 @@ import forestry.core.blocks.IColoredBlock; import forestry.core.items.IColoredItem; import forestry.core.models.BlockModelEntry; import forestry.core.models.ModelEntry; -import forestry.core.utils.ItemStackUtil; @SideOnly(Side.CLIENT) public class ModelManager implements IModelManager { + private final String modID; + private final List customBlockModels = new ArrayList<>(); private final List customModels = new ArrayList<>(); @@ -60,7 +58,9 @@ public class ModelManager implements IModelManager { public final IModelState DEFAULT_ITEM; public final IModelState DEFAULT_TOOL; - public ModelManager() { + public ModelManager(String modID) { + this.modID = modID; + TRSRTransformation blockThirdperson = get(0, 2.5f, 0, 75, 45, 0, 0.375f); ImmutableMap.Builder blockBuilder = ImmutableMap.builder(); blockBuilder.put(TransformType.GUI, get(0, 0, 0, 30, 225, 0, 0.625f)); @@ -133,7 +133,7 @@ public class ModelManager implements IModelManager { @Override public ModelResourceLocation getModelLocation(String identifier) { - return getModelLocation(Constants.CORE_MOD_ID, identifier); + return getModelLocation(modID, identifier); } @Override diff --git a/src/main/java/binnie/core/proxy/BinnieProxy.java b/src/main/java/binnie/core/proxy/BinnieProxy.java index b0a953aa..3f8ce0e9 100644 --- a/src/main/java/binnie/core/proxy/BinnieProxy.java +++ b/src/main/java/binnie/core/proxy/BinnieProxy.java @@ -6,7 +6,6 @@ import binnie.core.network.BinnieCorePacketID; import binnie.core.network.INetworkedEntity; import binnie.core.network.packet.MessageUpdate; import binnie.core.resource.BinnieResource; -import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/binnie/core/proxy/BinnieProxyClient.java b/src/main/java/binnie/core/proxy/BinnieProxyClient.java index 0b0d1797..21839d7d 100644 --- a/src/main/java/binnie/core/proxy/BinnieProxyClient.java +++ b/src/main/java/binnie/core/proxy/BinnieProxyClient.java @@ -1,5 +1,6 @@ package binnie.core.proxy; +import binnie.Constants; import binnie.core.machines.RendererMachine; import binnie.core.machines.TileEntityMachine; import binnie.core.models.ModelManager; @@ -29,7 +30,7 @@ import java.io.File; import java.io.IOException; public final class BinnieProxyClient extends BinnieProxy implements IBinnieProxy { - public static ModelManager modelManager = new ModelManager(); + public static ModelManager modelManager = new ModelManager(Constants.CORE_MOD_ID); public static ModelManager getModelManager() { return modelManager; diff --git a/src/main/java/binnie/extrabees/ExtraBees.java b/src/main/java/binnie/extrabees/ExtraBees.java index a6609a79..252732d2 100644 --- a/src/main/java/binnie/extrabees/ExtraBees.java +++ b/src/main/java/binnie/extrabees/ExtraBees.java @@ -23,9 +23,9 @@ import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -@Mod(modid = "ExtraBees", name = "Binnie's Extra Bees", useMetadata = true, dependencies = "required-after:" + Constants.CORE_MOD_ID) +@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("ExtraBees") + @Mod.Instance(Constants.EXTRA_BEES_MOD_ID) public static ExtraBees instance; @SidedProxy(clientSide = "binnie.extrabees.proxy.ExtraBeesProxyClient", serverSide = "binnie.extrabees.proxy.ExtraBeesProxyServer") public static ExtraBeesProxy proxy; diff --git a/src/main/java/binnie/extrabees/products/ModuleProducts.java b/src/main/java/binnie/extrabees/products/ModuleProducts.java index d5187993..818c06d4 100644 --- a/src/main/java/binnie/extrabees/products/ModuleProducts.java +++ b/src/main/java/binnie/extrabees/products/ModuleProducts.java @@ -1,6 +1,5 @@ package binnie.extrabees.products; -import binnie.core.BinnieCore; import binnie.core.IInitializable; import binnie.core.Mods; import binnie.extrabees.ExtraBees; diff --git a/src/main/java/binnie/extrabees/proxy/ExtraBeesProxyClient.java b/src/main/java/binnie/extrabees/proxy/ExtraBeesProxyClient.java index fe29b4b7..4057f407 100644 --- a/src/main/java/binnie/extrabees/proxy/ExtraBeesProxyClient.java +++ b/src/main/java/binnie/extrabees/proxy/ExtraBeesProxyClient.java @@ -1,17 +1,17 @@ package binnie.extrabees.proxy; +import binnie.Constants; import binnie.core.models.ModelManager; import binnie.extrabees.genetics.ExtraBeesSpecies; import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.EnumBeeType; -import forestry.api.core.IModelManager; import net.minecraft.block.Block; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.Item; import net.minecraftforge.client.model.ModelLoader; public class ExtraBeesProxyClient extends ExtraBeesProxy { - public static ModelManager modelManager = new ModelManager(); + public static ModelManager modelManager = new ModelManager(Constants.EXTRA_BEES_MOD_ID); @Override public void registerBeeModel(ExtraBeesSpecies type) { diff --git a/src/main/java/binnie/extratrees/ExtraTrees.java b/src/main/java/binnie/extratrees/ExtraTrees.java index c8403e26..b7f70101 100644 --- a/src/main/java/binnie/extratrees/ExtraTrees.java +++ b/src/main/java/binnie/extratrees/ExtraTrees.java @@ -40,9 +40,9 @@ import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -@Mod(modid = "extratrees", name = "Binnie's Extra Trees", useMetadata = true, dependencies = "required-after:" + Constants.CORE_MOD_ID) +@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("extratrees") + @Mod.Instance(Constants.EXTRA_TREES_MOD_ID) public static ExtraTrees instance; public static final String MOD_ID = "extratrees"; diff --git a/src/main/java/binnie/extratrees/proxy/ProxyClient.java b/src/main/java/binnie/extratrees/proxy/ProxyClient.java index c2f0dc12..b6b6475d 100644 --- a/src/main/java/binnie/extratrees/proxy/ProxyClient.java +++ b/src/main/java/binnie/extratrees/proxy/ProxyClient.java @@ -1,5 +1,6 @@ package binnie.extratrees.proxy; +import binnie.Constants; import binnie.core.models.ModelManager; import binnie.extratrees.ExtraTrees; import net.minecraft.block.Block; @@ -11,7 +12,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; public class ProxyClient extends Proxy implements IExtraTreeProxy { - public static ModelManager modelManager = new ModelManager(); + public static ModelManager modelManager = new ModelManager(Constants.EXTRA_TREES_MOD_ID); @Override public void init() { diff --git a/src/main/java/binnie/genetics/Genetics.java b/src/main/java/binnie/genetics/Genetics.java index 74dfec03..3292c0b2 100644 --- a/src/main/java/binnie/genetics/Genetics.java +++ b/src/main/java/binnie/genetics/Genetics.java @@ -23,10 +23,10 @@ import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -@Mod(modid = "Genetics", name = "Binnie's Genetics", useMetadata = true, dependencies = "required-after:" + Constants.CORE_MOD_ID) +@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; - @Mod.Instance("Genetics") + @Mod.Instance(Constants.GENETICS_MOD_ID) public static Genetics instance; @SidedProxy(clientSide = "binnie.genetics.proxy.ProxyClient", serverSide = "binnie.genetics.proxy.ProxyServer") public static Proxy proxy; diff --git a/src/main/java/binnie/genetics/item/ItemAnalyst.java b/src/main/java/binnie/genetics/item/ItemAnalyst.java index 76791f69..78426b3e 100644 --- a/src/main/java/binnie/genetics/item/ItemAnalyst.java +++ b/src/main/java/binnie/genetics/item/ItemAnalyst.java @@ -5,7 +5,6 @@ import binnie.genetics.CreativeTabGenetics; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsGUI; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumHand; diff --git a/src/main/java/binnie/genetics/item/ItemDatabase.java b/src/main/java/binnie/genetics/item/ItemDatabase.java index 9e199b17..fd8ddb1d 100644 --- a/src/main/java/binnie/genetics/item/ItemDatabase.java +++ b/src/main/java/binnie/genetics/item/ItemDatabase.java @@ -4,7 +4,6 @@ import binnie.core.item.ItemCore; import binnie.genetics.CreativeTabGenetics; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsGUI; -import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/binnie/genetics/item/ItemMasterRegistry.java b/src/main/java/binnie/genetics/item/ItemMasterRegistry.java index c7860635..be333450 100644 --- a/src/main/java/binnie/genetics/item/ItemMasterRegistry.java +++ b/src/main/java/binnie/genetics/item/ItemMasterRegistry.java @@ -5,7 +5,6 @@ import binnie.genetics.CreativeTabGenetics; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsGUI; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumHand; diff --git a/src/main/java/binnie/genetics/item/ItemRegistry.java b/src/main/java/binnie/genetics/item/ItemRegistry.java index d5b31daa..1433383c 100644 --- a/src/main/java/binnie/genetics/item/ItemRegistry.java +++ b/src/main/java/binnie/genetics/item/ItemRegistry.java @@ -5,7 +5,6 @@ import binnie.genetics.CreativeTabGenetics; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsGUI; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumHand; diff --git a/src/main/java/binnie/genetics/item/ModuleItem.java b/src/main/java/binnie/genetics/item/ModuleItem.java index 2ffcb56b..a7d3dc34 100644 --- a/src/main/java/binnie/genetics/item/ModuleItem.java +++ b/src/main/java/binnie/genetics/item/ModuleItem.java @@ -12,7 +12,6 @@ import binnie.extratrees.ExtraTrees; import binnie.genetics.CreativeTabGenetics; import binnie.genetics.Genetics; import forestry.api.recipes.RecipeManagers; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; diff --git a/src/main/java/binnie/genetics/proxy/ProxyClient.java b/src/main/java/binnie/genetics/proxy/ProxyClient.java index b7ded433..ba95e1da 100644 --- a/src/main/java/binnie/genetics/proxy/ProxyClient.java +++ b/src/main/java/binnie/genetics/proxy/ProxyClient.java @@ -1,11 +1,12 @@ package binnie.genetics.proxy; +import binnie.Constants; import binnie.core.models.ModelManager; import net.minecraft.block.Block; import net.minecraft.item.Item; public class ProxyClient extends Proxy implements IGeneticsProxy { - public static ModelManager modelManager = new ModelManager(); + public static ModelManager modelManager = new ModelManager(Constants.GENETICS_MOD_ID); public static ModelManager getModelManager() { return modelManager;