This commit is contained in:
Nedelosk committed 2016-10-21 13:40:04 +02:00
1 parent 8c61cacb57
commit 86bde197ec
22 files changed
+26 -34

No files matched your search

+4
View File
@@ -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";
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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 {
@@ -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 {
@@ -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<BlockModelEntry> customBlockModels = new ArrayList<>();
private final List<ModelEntry> 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<TransformType, TRSRTransformation> 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
@@ -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;
@@ -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;
@@ -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;
@@ -1,6 +1,5 @@
package binnie.extrabees.products;
import binnie.core.BinnieCore;
import binnie.core.IInitializable;
import binnie.core.Mods;
import binnie.extrabees.ExtraBees;
@@ -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) {
@@ -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";
@@ -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() {
+2 -2
View File
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;