diff --git a/src/main/java/binnie/botany/Botany.java b/src/main/java/binnie/botany/Botany.java index 453651ad..f966ed75 100644 --- a/src/main/java/binnie/botany/Botany.java +++ b/src/main/java/binnie/botany/Botany.java @@ -1,5 +1,6 @@ package binnie.botany; +import binnie.Constants; import binnie.botany.api.IFlower; import binnie.botany.api.gardening.IBlockSoil; import binnie.botany.ceramic.BlockCeramic; @@ -46,10 +47,10 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.eventhandler.Event; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -@Mod(modid = "Botany", name = "Binnie's Botany", useMetadata = true, dependencies = "required-after:BinnieCore") +@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("Botany") + @Mod.Instance(Constants.BOTANY_MOD_ID) public static Botany instance; @SidedProxy(clientSide = "binnie.botany.proxy.ProxyClient", serverSide = "binnie.botany.proxy.ProxyServer") public static Proxy proxy; @@ -88,11 +89,13 @@ public class Botany extends AbstractMod { //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 diff --git a/src/main/java/binnie/botany/gardening/ModuleGardening.java b/src/main/java/binnie/botany/gardening/ModuleGardening.java index 93ae2342..b2a2ff48 100644 --- a/src/main/java/binnie/botany/gardening/ModuleGardening.java +++ b/src/main/java/binnie/botany/gardening/ModuleGardening.java @@ -13,6 +13,7 @@ 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; @@ -43,20 +44,20 @@ public class ModuleGardening implements IInitializable { Botany.soilNoWeed = new BlockSoil(EnumSoilType.SOIL, "soilNoWeed", true); Botany.loamNoWeed = new BlockSoil(EnumSoilType.LOAM, "loamNoWeed", true); Botany.flowerbedNoWeed = new BlockSoil(EnumSoilType.FLOWERBED, "flowerbedNoWeed", true); - GameRegistry.register(Botany.plant = new BlockPlant()); - GameRegistry.register(new ItemWeed(Botany.plant).setRegistryName(Botany.plant.getRegistryName())); - GameRegistry.register(Botany.soil); - GameRegistry.register(new ItemSoil(Botany.soil).setRegistryName(Botany.soil.getRegistryName())); - GameRegistry.register(Botany.loam); - GameRegistry.register(new ItemSoil(Botany.loam).setRegistryName(Botany.loam.getRegistryName())); - GameRegistry.register(Botany.flowerbed); - GameRegistry.register(new ItemSoil(Botany.flowerbed).setRegistryName(Botany.flowerbed.getRegistryName())); - GameRegistry.register(Botany.soilNoWeed); - GameRegistry.register(new ItemSoil(Botany.soilNoWeed).setRegistryName(Botany.soilNoWeed.getRegistryName())); - GameRegistry.register(Botany.loamNoWeed); - GameRegistry.register(new ItemSoil(Botany.loamNoWeed).setRegistryName(Botany.loamNoWeed.getRegistryName())); - GameRegistry.register(Botany.flowerbedNoWeed); - GameRegistry.register(new ItemSoil(Botany.flowerbedNoWeed).setRegistryName(Botany.flowerbedNoWeed.getRegistryName())); + Botany.proxy.registerBlock(Botany.plant = new BlockPlant()); + Botany.proxy.registerItem(new ItemWeed(Botany.plant).setRegistryName(Botany.plant.getRegistryName())); + Botany.proxy.registerBlock(Botany.soil); + Botany.proxy.registerItem(new ItemSoil(Botany.soil).setRegistryName(Botany.soil.getRegistryName())); + Botany.proxy.registerBlock(Botany.loam); + Botany.proxy.registerItem(new ItemSoil(Botany.loam).setRegistryName(Botany.loam.getRegistryName())); + Botany.proxy.registerBlock(Botany.flowerbed); + Botany.proxy.registerItem(new ItemSoil(Botany.flowerbed).setRegistryName(Botany.flowerbed.getRegistryName())); + Botany.proxy.registerBlock(Botany.soilNoWeed); + Botany.proxy.registerItem(new ItemSoil(Botany.soilNoWeed).setRegistryName(Botany.soilNoWeed.getRegistryName())); + Botany.proxy.registerBlock(Botany.loamNoWeed); + Botany.proxy.registerItem(new ItemSoil(Botany.loamNoWeed).setRegistryName(Botany.loamNoWeed.getRegistryName())); + Botany.proxy.registerBlock(Botany.flowerbedNoWeed); + Botany.proxy.registerItem(new ItemSoil(Botany.flowerbedNoWeed).setRegistryName(Botany.flowerbedNoWeed.getRegistryName())); Botany.soilMeter = new ItemSoilMeter(); Botany.insulatedTube = new ItemInsulatedTube(); Botany.trowelWood = new ItemTrowel(Item.ToolMaterial.WOOD, "Wood"); @@ -69,19 +70,19 @@ public class ModuleGardening implements IInitializable { Botany.clay = new ItemClay(); Botany.ceramic = new BlockCeramic(); Botany.stained = new BlockStained(); - GameRegistry.register(Botany.ceramic); - GameRegistry.register(new ItemMetadata(Botany.ceramic).setRegistryName(Botany.ceramic.getRegistryName())); + Botany.proxy.registerBlock(Botany.ceramic); + Botany.proxy.registerItem(new ItemMetadata(Botany.ceramic).setRegistryName(Botany.ceramic.getRegistryName())); // BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(Botany.ceramic), new ItemMetadataRenderer()); - GameRegistry.register(Botany.stained); - GameRegistry.register(new ItemMetadata(Botany.stained).setRegistryName(Botany.stained.getRegistryName())); + Botany.proxy.registerBlock(Botany.stained); + Botany.proxy.registerItem(new ItemMetadata(Botany.stained).setRegistryName(Botany.stained.getRegistryName())); // BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(Botany.stained), new ItemMetadataRenderer()); Botany.ceramicTile = new BlockCeramicPatterned(); Botany.ceramicBrick = new BlockCeramicBrick(); - GameRegistry.register(Botany.ceramicTile); - GameRegistry.register(new ItemMetadata(Botany.ceramicTile).setRegistryName(Botany.ceramicTile.getRegistryName())); - GameRegistry.register(Botany.ceramicBrick); - GameRegistry.register(new ItemMetadata(Botany.ceramicBrick).setRegistryName(Botany.ceramicBrick.getRegistryName())); + Botany.proxy.registerBlock(Botany.ceramicTile); + Botany.proxy.registerItem(new ItemMetadata(Botany.ceramicTile).setRegistryName(Botany.ceramicTile.getRegistryName())); + Botany.proxy.registerBlock(Botany.ceramicBrick); + Botany.proxy.registerItem(new ItemMetadata(Botany.ceramicBrick).setRegistryName(Botany.ceramicBrick.getRegistryName())); // BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(Botany.ceramicTile), new MultipassItemRenderer()); // BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(Botany.ceramicBrick), new MultipassItemRenderer()); } diff --git a/src/main/java/binnie/botany/proxy/ProxyClient.java b/src/main/java/binnie/botany/proxy/ProxyClient.java index 34fbba75..57d014ec 100644 --- a/src/main/java/binnie/botany/proxy/ProxyClient.java +++ b/src/main/java/binnie/botany/proxy/ProxyClient.java @@ -1,4 +1,35 @@ package binnie.botany.proxy; +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 getModelManager() { + return modelManager; + } + + @Override + public Item registerItem(Item item) { + getModelManager().registerItemClient(item); + return super.registerItem(item); + } + + @Override + public Block registerBlock(Block block) { + getModelManager().registerBlockClient(block); + return super.registerBlock(block); + } + + @Override + public void registerModels() { + getModelManager().registerModels(); + } + + @Override + public void registerItemAndBlockColors() { + getModelManager().registerItemAndBlockColors(); + } } diff --git a/src/main/java/binnie/core/BinnieCore.java b/src/main/java/binnie/core/BinnieCore.java index 32e4893c..2427c2da 100644 --- a/src/main/java/binnie/core/BinnieCore.java +++ b/src/main/java/binnie/core/BinnieCore.java @@ -48,7 +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("BinnieCore") + @Mod.Instance(Constants.CORE_MOD_ID) public static BinnieCore instance; @SidedProxy(clientSide = "binnie.core.proxy.BinnieProxyClient", serverSide = "binnie.core.proxy.BinnieProxyServer") public static BinnieProxy proxy; @@ -95,8 +95,9 @@ public final class BinnieCore extends AbstractMod { BinnieCore.instance = this; for (final FluidContainer container : FluidContainer.values()) { final Item item = new ItemFluidContainer(container); - GameRegistry.register(item); + BinnieCore.proxy.registerItem(item); } + //TODO REMMOVE ITEMPARSER FieldParser.parsers.add(new ItemParser()); super.preInit(); } diff --git a/src/main/java/binnie/core/item/ItemCore.java b/src/main/java/binnie/core/item/ItemCore.java index 450c5949..367b027d 100644 --- a/src/main/java/binnie/core/item/ItemCore.java +++ b/src/main/java/binnie/core/item/ItemCore.java @@ -7,7 +7,7 @@ import net.minecraft.item.Item; public class ItemCore extends Item implements IItemModelRegister{ public ItemCore(String registryName) { - setRegistryName(getRegistryName()); + setRegistryName(registryName); } @Override diff --git a/src/main/java/binnie/core/item/ItemFieldKit.java b/src/main/java/binnie/core/item/ItemFieldKit.java index fd1e09a9..fec6d0d7 100644 --- a/src/main/java/binnie/core/item/ItemFieldKit.java +++ b/src/main/java/binnie/core/item/ItemFieldKit.java @@ -15,15 +15,15 @@ import net.minecraftforge.fml.relauncher.SideOnly; import java.util.List; -public class ItemFieldKit extends Item { +public class ItemFieldKit extends ItemCore { // private IIcon fieldKit0; // private IIcon fieldKit1; // private IIcon fieldKit2; // private IIcon fieldKit3; public ItemFieldKit() { + super("fieldKit"); this.setUnlocalizedName("fieldKit"); - setRegistryName("fieldKit"); this.setCreativeTab(CreativeTabs.TOOLS); this.setMaxStackSize(1); this.setMaxDamage(64); diff --git a/src/main/java/binnie/core/item/ItemGenesis.java b/src/main/java/binnie/core/item/ItemGenesis.java index 5432f51b..c404f262 100644 --- a/src/main/java/binnie/core/item/ItemGenesis.java +++ b/src/main/java/binnie/core/item/ItemGenesis.java @@ -11,7 +11,7 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -public class ItemGenesis extends Item { +public class ItemGenesis extends ItemCore { // @Override // @SideOnly(Side.CLIENT) // public void registerIcons(final IIconRegister register) { @@ -19,9 +19,9 @@ public class ItemGenesis extends Item { // } public ItemGenesis() { + super("genesis"); this.setCreativeTab(Tabs.tabApiculture); this.setUnlocalizedName("genesis"); - setRegistryName("genesis"); this.setMaxStackSize(1); } diff --git a/src/main/java/binnie/core/item/ItemMisc.java b/src/main/java/binnie/core/item/ItemMisc.java index 0289eb7d..2200f8ec 100644 --- a/src/main/java/binnie/core/item/ItemMisc.java +++ b/src/main/java/binnie/core/item/ItemMisc.java @@ -63,7 +63,7 @@ public class ItemMisc extends ItemCore { @Override public void registerModel(Item item, IModelManager manager) { for (IItemMisc type : items) { - manager.registerItemModel(item, type.ordinal(), type.name().toLowerCase(Locale.ENGLISH));; + manager.registerItemModel(item, type.ordinal(), type.name().toLowerCase(Locale.ENGLISH)); } } diff --git a/src/main/java/binnie/core/mod/parser/ItemParser.java b/src/main/java/binnie/core/mod/parser/ItemParser.java index 7f0ca4ba..91f33782 100644 --- a/src/main/java/binnie/core/mod/parser/ItemParser.java +++ b/src/main/java/binnie/core/mod/parser/ItemParser.java @@ -1,6 +1,7 @@ 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; @@ -16,7 +17,7 @@ public class ItemParser extends FieldParser { public void preInit(final Field field, final AbstractMod mod) throws IllegalArgumentException, IllegalAccessException { final Item item = (Item) field.get(null); if (item != null) { - GameRegistry.register(item); + BinnieCore.proxy.registerItem(item); } } } diff --git a/src/main/java/binnie/core/models/ModelManager.java b/src/main/java/binnie/core/models/ModelManager.java index 15b5d038..d2832085 100644 --- a/src/main/java/binnie/core/models/ModelManager.java +++ b/src/main/java/binnie/core/models/ModelManager.java @@ -47,8 +47,6 @@ import forestry.core.utils.ItemStackUtil; @SideOnly(Side.CLIENT) public class ModelManager implements IModelManager { - private static final ModelManager instance = new ModelManager(); - private final List customBlockModels = new ArrayList<>(); private final List customModels = new ArrayList<>(); @@ -92,14 +90,6 @@ public class ModelManager implements IModelManager { TransformType.FIRST_PERSON_LEFT_HAND, get(1.13f, 3.2f, 1.13f, 0, 90, -25, 0.68f))); } - static { - ForestryAPI.modelManager = instance; - } - - public static ModelManager getInstance() { - return instance; - } - private TRSRTransformation get(float tx, float ty, float tz, float ax, float ay, float az, float s){ return TRSRTransformation.blockCenterToCorner(new TRSRTransformation( new Vector3f(tx / 16, ty / 16, tz / 16), diff --git a/src/main/java/binnie/core/proxy/BinnieModProxy.java b/src/main/java/binnie/core/proxy/BinnieModProxy.java index 1615da94..2b6c8f24 100644 --- a/src/main/java/binnie/core/proxy/BinnieModProxy.java +++ b/src/main/java/binnie/core/proxy/BinnieModProxy.java @@ -5,11 +5,13 @@ import binnie.core.AbstractMod; import binnie.core.BinnieCore; import binnie.core.gui.IBinnieGUID; import binnie.core.network.packet.MessageBase; +import net.minecraft.block.Block; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; import net.minecraft.util.math.BlockPos; +import net.minecraftforge.fml.common.registry.GameRegistry; public class BinnieModProxy implements IBinnieModProxy { private AbstractMod mod; @@ -17,6 +19,20 @@ public class BinnieModProxy implements IBinnieModProxy { public BinnieModProxy(final AbstractMod mod) { this.mod = mod; } + + public Item registerItem(Item item){ + return GameRegistry.register(item); + } + + public Block registerBlock(Block block){ + return GameRegistry.register(block); + } + + public void registerModels() { + } + + public void registerItemAndBlockColors() { + } @Override public void openGui(final IBinnieGUID ID, final EntityPlayer player, final BlockPos pos) { diff --git a/src/main/java/binnie/core/proxy/BinnieProxy.java b/src/main/java/binnie/core/proxy/BinnieProxy.java index 79c18909..b0a953aa 100644 --- a/src/main/java/binnie/core/proxy/BinnieProxy.java +++ b/src/main/java/binnie/core/proxy/BinnieProxy.java @@ -6,6 +6,7 @@ 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; @@ -28,16 +29,6 @@ public class BinnieProxy extends BinnieModProxy implements IBinnieProxy { super(BinnieCore.instance); this.uniqueTextureUID = 1200; } - - public Item registerItem(Item item){ - return GameRegistry.register(item); - } - - public void registerModels() { - } - - public void registerItemAndBlockColors() { - } @Override public void preInit() { diff --git a/src/main/java/binnie/core/proxy/BinnieProxyClient.java b/src/main/java/binnie/core/proxy/BinnieProxyClient.java index 81ddd90d..0b0d1797 100644 --- a/src/main/java/binnie/core/proxy/BinnieProxyClient.java +++ b/src/main/java/binnie/core/proxy/BinnieProxyClient.java @@ -5,6 +5,7 @@ import binnie.core.machines.TileEntityMachine; import binnie.core.models.ModelManager; import binnie.core.resource.BinnieResource; import binnie.craftgui.resource.minecraft.CraftGUIResourceManager; +import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.texture.SimpleTexture; @@ -27,22 +28,33 @@ import org.lwjgl.opengl.GL11; import java.io.File; import java.io.IOException; -public final class BinnieProxyClient extends BinnieProxy implements IBinnieProxy { - +public final class BinnieProxyClient extends BinnieProxy implements IBinnieProxy { + public static ModelManager modelManager = new ModelManager(); + + public static ModelManager getModelManager() { + return modelManager; + } + @Override public Item registerItem(Item item) { - ModelManager.getInstance().registerItemClient(item); + getModelManager().registerItemClient(item); return super.registerItem(item); } + @Override + public Block registerBlock(Block block) { + getModelManager().registerBlockClient(block); + return super.registerBlock(block); + } + @Override public void registerModels() { - ModelManager.getInstance().registerModels(); + getModelManager().registerModels(); } @Override public void registerItemAndBlockColors() { - ModelManager.getInstance().registerItemAndBlockColors(); + getModelManager().registerItemAndBlockColors(); } @Override diff --git a/src/main/java/binnie/extrabees/ExtraBees.java b/src/main/java/binnie/extrabees/ExtraBees.java index 66fddaa1..a6609a79 100644 --- a/src/main/java/binnie/extrabees/ExtraBees.java +++ b/src/main/java/binnie/extrabees/ExtraBees.java @@ -1,5 +1,6 @@ package binnie.extrabees; +import binnie.Constants; import binnie.core.AbstractMod; import binnie.core.BinnieCore; import binnie.core.gui.IBinnieGUID; @@ -22,7 +23,7 @@ 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:BinnieCore") +@Mod(modid = "ExtraBees", name = "Binnie's Extra Bees", useMetadata = true, dependencies = "required-after:" + Constants.CORE_MOD_ID) public class ExtraBees extends AbstractMod { @Mod.Instance("ExtraBees") public static ExtraBees instance; @@ -51,11 +52,13 @@ public class ExtraBees extends AbstractMod { 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 diff --git a/src/main/java/binnie/extrabees/products/ModuleProducts.java b/src/main/java/binnie/extrabees/products/ModuleProducts.java index cf3f9221..d5187993 100644 --- a/src/main/java/binnie/extrabees/products/ModuleProducts.java +++ b/src/main/java/binnie/extrabees/products/ModuleProducts.java @@ -18,9 +18,9 @@ public class ModuleProducts implements IInitializable { ExtraBees.comb = new ItemHoneyComb(); ExtraBees.propolis = new ItemPropolis(); - BinnieCore.proxy.registerItem(ExtraBees.honeyCrystal); - BinnieCore.proxy.registerItem(ExtraBees.honeyCrystalEmpty); - BinnieCore.proxy.registerItem(ExtraBees.comb); + ExtraBees.proxy.registerItem(ExtraBees.honeyCrystal); + ExtraBees.proxy.registerItem(ExtraBees.honeyCrystalEmpty); + ExtraBees.proxy.registerItem(ExtraBees.comb); ExtraBees.proxy.registermodel(ExtraBees.honeyCrystal, 0); diff --git a/src/main/java/binnie/extrabees/proxy/ExtraBeesProxyClient.java b/src/main/java/binnie/extrabees/proxy/ExtraBeesProxyClient.java index a67e4f83..fe29b4b7 100644 --- a/src/main/java/binnie/extrabees/proxy/ExtraBeesProxyClient.java +++ b/src/main/java/binnie/extrabees/proxy/ExtraBeesProxyClient.java @@ -1,13 +1,18 @@ package binnie.extrabees.proxy; +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(); + @Override public void registerBeeModel(ExtraBeesSpecies type) { for (EnumBeeType t : EnumBeeType.VALUES) @@ -23,4 +28,30 @@ public class ExtraBeesProxyClient extends ExtraBeesProxy { public void registermodel(Item item, int meta, ModelResourceLocation modelResourceLocation) { ModelLoader.setCustomModelResourceLocation(item, meta, modelResourceLocation); } + + public static ModelManager getModelManager() { + return modelManager; + } + + @Override + public Item registerItem(Item item) { + getModelManager().registerItemClient(item); + return super.registerItem(item); + } + + @Override + public Block registerBlock(Block block) { + getModelManager().registerBlockClient(block); + return super.registerBlock(block); + } + + @Override + public void registerModels() { + getModelManager().registerModels(); + } + + @Override + public void registerItemAndBlockColors() { + getModelManager().registerItemAndBlockColors(); + } } diff --git a/src/main/java/binnie/extratrees/ExtraTrees.java b/src/main/java/binnie/extratrees/ExtraTrees.java index ca76dc64..c8403e26 100644 --- a/src/main/java/binnie/extratrees/ExtraTrees.java +++ b/src/main/java/binnie/extratrees/ExtraTrees.java @@ -1,5 +1,6 @@ package binnie.extratrees; +import binnie.Constants; import binnie.core.AbstractMod; import binnie.core.BinnieCore; import binnie.core.gui.IBinnieGUID; @@ -39,7 +40,7 @@ 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:BinnieCore") +@Mod(modid = "extratrees", name = "Binnie's Extra Trees", useMetadata = true, dependencies = "required-after:" + Constants.CORE_MOD_ID) public class ExtraTrees extends AbstractMod { @Mod.Instance("extratrees") public static ExtraTrees instance; @@ -88,6 +89,7 @@ public class ExtraTrees extends AbstractMod { this.addModule(new ModuleMachine()); this.addModule(new ModuleCore()); this.preInit(); + proxy.registerModels(); } @Mod.EventHandler @@ -117,6 +119,7 @@ public class ExtraTrees extends AbstractMod { @Mod.EventHandler public void init(final FMLInitializationEvent evt) { this.init(); + proxy.registerItemAndBlockColors(); } @Mod.EventHandler diff --git a/src/main/java/binnie/extratrees/proxy/ProxyClient.java b/src/main/java/binnie/extratrees/proxy/ProxyClient.java index c8d869dd..c2f0dc12 100644 --- a/src/main/java/binnie/extratrees/proxy/ProxyClient.java +++ b/src/main/java/binnie/extratrees/proxy/ProxyClient.java @@ -1,15 +1,18 @@ package binnie.extratrees.proxy; +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; import net.minecraft.client.renderer.block.statemap.StateMapperBase; +import net.minecraft.item.Item; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; public class ProxyClient extends Proxy implements IExtraTreeProxy { - + public static ModelManager modelManager = new ModelManager(); + @Override public void init() { //ForestryAPI.textureManager.registerIconProvider(FruitSprite.Average); @@ -33,5 +36,31 @@ public class ProxyClient extends Proxy implements IExtraTreeProxy { return new ModelResourceLocation(rl, this.getPropertyString(state.getProperties())); } } + + public static ModelManager getModelManager() { + return modelManager; + } + + @Override + public Item registerItem(Item item) { + getModelManager().registerItemClient(item); + return super.registerItem(item); + } + + @Override + public Block registerBlock(Block block) { + getModelManager().registerBlockClient(block); + return super.registerBlock(block); + } + + @Override + public void registerModels() { + getModelManager().registerModels(); + } + + @Override + public void registerItemAndBlockColors() { + getModelManager().registerItemAndBlockColors(); + } } diff --git a/src/main/java/binnie/genetics/Genetics.java b/src/main/java/binnie/genetics/Genetics.java index 13e6f7f4..74dfec03 100644 --- a/src/main/java/binnie/genetics/Genetics.java +++ b/src/main/java/binnie/genetics/Genetics.java @@ -1,5 +1,6 @@ package binnie.genetics; +import binnie.Constants; import binnie.core.AbstractMod; import binnie.core.BinnieCore; import binnie.core.gui.IBinnieGUID; @@ -22,7 +23,7 @@ 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:BinnieCore") +@Mod(modid = "Genetics", 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") @@ -46,11 +47,13 @@ public class Genetics extends AbstractMod { 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 diff --git a/src/main/java/binnie/genetics/item/ItemMasterRegistry.java b/src/main/java/binnie/genetics/item/ItemMasterRegistry.java index 0d940c44..c7860635 100644 --- a/src/main/java/binnie/genetics/item/ItemMasterRegistry.java +++ b/src/main/java/binnie/genetics/item/ItemMasterRegistry.java @@ -1,5 +1,6 @@ package binnie.genetics.item; +import binnie.core.item.ItemCore; import binnie.genetics.CreativeTabGenetics; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsGUI; @@ -11,7 +12,7 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -public class ItemMasterRegistry extends Item { +public class ItemMasterRegistry extends ItemCore { // @Override // @SideOnly(Side.CLIENT) // public void registerIcons(final IIconRegister register) { @@ -19,10 +20,10 @@ public class ItemMasterRegistry extends Item { // } public ItemMasterRegistry() { + super("masterRegistry"); this.setCreativeTab(CreativeTabGenetics.instance); this.setUnlocalizedName("masterRegistry"); this.setMaxStackSize(1); - setRegistryName("masterRegistry"); } @Override diff --git a/src/main/java/binnie/genetics/item/ModuleItem.java b/src/main/java/binnie/genetics/item/ModuleItem.java index d0f15daa..2ffcb56b 100644 --- a/src/main/java/binnie/genetics/item/ModuleItem.java +++ b/src/main/java/binnie/genetics/item/ModuleItem.java @@ -44,19 +44,19 @@ public class ModuleItem implements IInitializable { Genetics.itemSerumArray = new ItemSerumArray(); Genetics.itemSequencer = new ItemSequence(); Genetics.itemGenetics = Binnie.Item.registerMiscItems(GeneticsItems.values(), CreativeTabGenetics.instance); - BinnieCore.proxy.registerItem(Genetics.itemSerum); - BinnieCore.proxy.registerItem(Genetics.itemSerumArray); - BinnieCore.proxy.registerItem(Genetics.itemSequencer); - BinnieCore.proxy.registerItem(Genetics.itemGenetics); + Genetics.proxy.registerItem(Genetics.itemSerum); + Genetics.proxy.registerItem(Genetics.itemSerumArray); + Genetics.proxy.registerItem(Genetics.itemSequencer); + Genetics.proxy.registerItem(Genetics.itemGenetics); Genetics.database = new ItemDatabase(); Genetics.analyst = new ItemAnalyst(); Genetics.registry = new ItemRegistry(); Genetics.masterRegistry = new ItemMasterRegistry(); - BinnieCore.proxy.registerItem(Genetics.database); - BinnieCore.proxy.registerItem(Genetics.analyst); - BinnieCore.proxy.registerItem(Genetics.registry); - BinnieCore.proxy.registerItem(Genetics.masterRegistry); + Genetics.proxy.registerItem(Genetics.database); + Genetics.proxy.registerItem(Genetics.analyst); + Genetics.proxy.registerItem(Genetics.registry); + Genetics.proxy.registerItem(Genetics.masterRegistry); Binnie.Liquid.createLiquids(GeneticLiquid.values(), ItemFluidContainer.LiquidGenetics); } diff --git a/src/main/java/binnie/genetics/proxy/ProxyClient.java b/src/main/java/binnie/genetics/proxy/ProxyClient.java index 5c866173..b7ded433 100644 --- a/src/main/java/binnie/genetics/proxy/ProxyClient.java +++ b/src/main/java/binnie/genetics/proxy/ProxyClient.java @@ -1,4 +1,35 @@ package binnie.genetics.proxy; +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 getModelManager() { + return modelManager; + } + + @Override + public Item registerItem(Item item) { + getModelManager().registerItemClient(item); + return super.registerItem(item); + } + + @Override + public Block registerBlock(Block block) { + getModelManager().registerBlockClient(block); + return super.registerBlock(block); + } + + @Override + public void registerModels() { + getModelManager().registerModels(); + } + + @Override + public void registerItemAndBlockColors() { + getModelManager().registerItemAndBlockColors(); + } } diff --git a/src/main/resources/assets/genetics/blockstates/analyst.json b/src/main/resources/assets/genetics/blockstates/analyst.json deleted file mode 100644 index 3078e689..00000000 --- a/src/main/resources/assets/genetics/blockstates/analyst.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "inventory": { - "model": "forge:item-layer", - "transform": "forge:default-item", - "textures": { - "layer0": "genetics:items/analyst" - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/genetics/blockstates/geneticdatabase.json b/src/main/resources/assets/genetics/blockstates/geneticdatabase.json deleted file mode 100644 index 27811096..00000000 --- a/src/main/resources/assets/genetics/blockstates/geneticdatabase.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "forge_marker": 1, - "defaults":{ - "model": "forge:item-layer", - "transform": "forge:default-item" - }, - "variants": { - "type": { - "database": { - "textures": { - "layer0": "genetics:items/geneDatabase" - } - }, - "master_database": { - "textures": { - "layer0": "genetics:items/masterGeneDatabase" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/genetics/blockstates/masterRegistry.json b/src/main/resources/assets/genetics/blockstates/masterRegistry.json deleted file mode 100644 index 70fc01f4..00000000 --- a/src/main/resources/assets/genetics/blockstates/masterRegistry.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "inventory": { - "model": "forge:item-layer", - "transform": "forge:default-item", - "textures": { - "layer0": "genetics:items/masterRegistry" - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/genetics/blockstates/misc.json b/src/main/resources/assets/genetics/blockstates/misc.json deleted file mode 100644 index be242854..00000000 --- a/src/main/resources/assets/genetics/blockstates/misc.json +++ /dev/null @@ -1,82 +0,0 @@ -{ - "forge_marker": 1, - "defaults":{ - "model": "forge:item-layer", - "transform": "forge:default-item" - }, - "variants": { - "type": { - "laboratorycasing": { - "textures": { - "layer0": "genetics:items/casingIron" - } - }, - "dnadye": { - "textures": { - "layer0": "genetics:items/dnaDye" - } - }, - "fluorescentdye": { - "textures": { - "layer0": "genetics:items/dyeFluor" - } - }, - "enzyme": { - "textures": { - "layer0": "genetics:items/enzyme" - } - }, - "growthmedium": { - "textures": { - "layer0": "genetics:items/growthMedium" - } - }, - "emptysequencer": { - "textures": { - "layer0": "genetics:items/sequencerEmpty" - } - }, - "emptyserum": { - "textures": { - "layer0": "genetics:items/serumEmpty" - } - }, - "emptygenome": { - "textures": { - "layer0": "genetics:items/genomeEmpty" - } - }, - "cylinder": { - "textures": { - "layer0": "genetics:items/cylinderEmpty" - } - }, - "integratedcircuit": { - "textures": { - "layer0": "genetics:items/integratedCircuit" - } - }, - "integratedcpu": { - "textures": { - "layer0": "genetics:items/integratedCPU" - } - }, - "integratedcasing": { - "textures": { - "layer0": "genetics:items/casingCircuit" - } - } - } - } -} - - - - - - - - - - - diff --git a/src/main/resources/assets/genetics/blockstates/registry.json b/src/main/resources/assets/genetics/blockstates/registry.json deleted file mode 100644 index d3ce76b2..00000000 --- a/src/main/resources/assets/genetics/blockstates/registry.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "inventory": { - "model": "forge:item-layer", - "transform": "forge:default-item", - "textures": { - "layer0": "genetics:items/registry" - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/genetics/blockstates/sequence.json b/src/main/resources/assets/genetics/blockstates/sequence.json deleted file mode 100644 index 1db72f25..00000000 --- a/src/main/resources/assets/genetics/blockstates/sequence.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "inventory": { - "model": "forge:item-layer", - "transform": "forge:default-item", - "textures": { - "layer0": "genetics:items/sequencer" - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/genetics/blockstates/serumArray.json b/src/main/resources/assets/genetics/blockstates/serumArray.json deleted file mode 100644 index 1c8fab63..00000000 --- a/src/main/resources/assets/genetics/blockstates/serumArray.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "inventory": { - "model": "forge:item-layer", - "transform": "forge:default-item", - "textures": { - "layer0":"genetics:items/machines/genome.glass", - "layer1":"genetics:items/machines/genome.cap", - "layer2":"genetics:items/machines/genome.edges", - "layer3":"genetics:items/machines/genome.dna" - }, - "display": { - "thirdperson": { - "rotation": [ 0, 90, -35 ], - "translation": [ 0, 1.25, -3.5 ], - "scale": [ 0.85, 0.85, 0.85 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/genetics/models/item/analyst.json b/src/main/resources/assets/genetics/models/item/analyst.json new file mode 100644 index 00000000..98849a1f --- /dev/null +++ b/src/main/resources/assets/genetics/models/item/analyst.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "genetics:items/analyst" + } +} diff --git a/src/main/resources/assets/genetics/models/item/cylinder.json b/src/main/resources/assets/genetics/models/item/cylinder.json new file mode 100644 index 00000000..17237917 --- /dev/null +++ b/src/main/resources/assets/genetics/models/item/cylinder.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "genetics:items/cylinderEmpty" + } +} diff --git a/src/main/resources/assets/genetics/models/item/dnadye.json b/src/main/resources/assets/genetics/models/item/dnadye.json new file mode 100644 index 00000000..23d2894e --- /dev/null +++ b/src/main/resources/assets/genetics/models/item/dnadye.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "genetics:items/dnaDye" + } +} diff --git a/src/main/resources/assets/genetics/models/item/emptygenome.json b/src/main/resources/assets/genetics/models/item/emptygenome.json new file mode 100644 index 00000000..6b908399 --- /dev/null +++ b/src/main/resources/assets/genetics/models/item/emptygenome.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "genetics:items/genomeEmpty" + } +} diff --git a/src/main/resources/assets/genetics/models/item/emptysequencer.json b/src/main/resources/assets/genetics/models/item/emptysequencer.json new file mode 100644 index 00000000..05d9bc2c --- /dev/null +++ b/src/main/resources/assets/genetics/models/item/emptysequencer.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "genetics:items/sequencerEmpty" + } +} diff --git a/src/main/resources/assets/genetics/models/item/emptyserum.json b/src/main/resources/assets/genetics/models/item/emptyserum.json new file mode 100644 index 00000000..b7add8e6 --- /dev/null +++ b/src/main/resources/assets/genetics/models/item/emptyserum.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "genetics:items/serumEmpty" + } +} diff --git a/src/main/resources/assets/genetics/models/item/enzyme.json b/src/main/resources/assets/genetics/models/item/enzyme.json new file mode 100644 index 00000000..07b046b9 --- /dev/null +++ b/src/main/resources/assets/genetics/models/item/enzyme.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "genetics:items/enzyme" + } +} diff --git a/src/main/resources/assets/genetics/models/item/fluorescentdye.json b/src/main/resources/assets/genetics/models/item/fluorescentdye.json new file mode 100644 index 00000000..77cabb12 --- /dev/null +++ b/src/main/resources/assets/genetics/models/item/fluorescentdye.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "genetics:items/dyeFluor" + } +} diff --git a/src/main/resources/assets/genetics/models/item/geneticdatabase.json b/src/main/resources/assets/genetics/models/item/geneticdatabase.json new file mode 100644 index 00000000..a7ed51c7 --- /dev/null +++ b/src/main/resources/assets/genetics/models/item/geneticdatabase.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "genetics:items/geneDatabase" + } +} diff --git a/src/main/resources/assets/genetics/models/item/geneticdatabase_master.json b/src/main/resources/assets/genetics/models/item/geneticdatabase_master.json new file mode 100644 index 00000000..69135bb6 --- /dev/null +++ b/src/main/resources/assets/genetics/models/item/geneticdatabase_master.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "genetics:items/masterGeneDatabase" + } +} diff --git a/src/main/resources/assets/genetics/models/item/growthmedium.json b/src/main/resources/assets/genetics/models/item/growthmedium.json new file mode 100644 index 00000000..5ff76829 --- /dev/null +++ b/src/main/resources/assets/genetics/models/item/growthmedium.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "genetics:items/growthMedium" + } +} diff --git a/src/main/resources/assets/genetics/models/item/integratedcasing.json b/src/main/resources/assets/genetics/models/item/integratedcasing.json new file mode 100644 index 00000000..61b01774 --- /dev/null +++ b/src/main/resources/assets/genetics/models/item/integratedcasing.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "genetics:items/casingCircuit" + } +} diff --git a/src/main/resources/assets/genetics/models/item/integratedcircuit.json b/src/main/resources/assets/genetics/models/item/integratedcircuit.json new file mode 100644 index 00000000..8c556231 --- /dev/null +++ b/src/main/resources/assets/genetics/models/item/integratedcircuit.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "genetics:items/integratedCircuit" + } +} diff --git a/src/main/resources/assets/genetics/models/item/integratedcpu.json b/src/main/resources/assets/genetics/models/item/integratedcpu.json new file mode 100644 index 00000000..977557e3 --- /dev/null +++ b/src/main/resources/assets/genetics/models/item/integratedcpu.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "genetics:items/integratedCPU" + } +} diff --git a/src/main/resources/assets/genetics/models/item/laboratorycasing.json b/src/main/resources/assets/genetics/models/item/laboratorycasing.json new file mode 100644 index 00000000..b1a7b2c7 --- /dev/null +++ b/src/main/resources/assets/genetics/models/item/laboratorycasing.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "genetics:items/casingIron" + } +} diff --git a/src/main/resources/assets/genetics/models/item/masterRegistry.json b/src/main/resources/assets/genetics/models/item/masterRegistry.json new file mode 100644 index 00000000..e6339b1c --- /dev/null +++ b/src/main/resources/assets/genetics/models/item/masterRegistry.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "genetics:items/masterRegistry" + } +} diff --git a/src/main/resources/assets/genetics/models/item/registry.json b/src/main/resources/assets/genetics/models/item/registry.json new file mode 100644 index 00000000..14854043 --- /dev/null +++ b/src/main/resources/assets/genetics/models/item/registry.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "genetics:items/registry" + } +} diff --git a/src/main/resources/assets/genetics/models/item/sequence.json b/src/main/resources/assets/genetics/models/item/sequence.json new file mode 100644 index 00000000..67897543 --- /dev/null +++ b/src/main/resources/assets/genetics/models/item/sequence.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "genetics:items/sequence" + } +} diff --git a/src/main/resources/assets/genetics/blockstates/serum.json b/src/main/resources/assets/genetics/models/item/serum.json similarity index 74% rename from src/main/resources/assets/genetics/blockstates/serum.json rename to src/main/resources/assets/genetics/models/item/serum.json index eedf711a..d3d17f6c 100644 --- a/src/main/resources/assets/genetics/blockstates/serum.json +++ b/src/main/resources/assets/genetics/models/item/serum.json @@ -1,16 +1,12 @@ { - "forge_marker": 1, - "variants": { - "inventory": { - "model": "forge:item-layer", - "transform": "forge:default-item", - "textures": { + "parent": "item/generated", + "textures": { "layer0":"genetics:items/machines/serum.glass", "layer1":"genetics:items/machines/serum.cap", "layer2":"genetics:items/machines/serum.edges", "layer3":"genetics:items/machines/serum.dna" }, - "display": { + "display": { "thirdperson": { "rotation": [ 0, 90, -35 ], "translation": [ 0, 1.25, -3.5 ], @@ -21,7 +17,5 @@ "translation": [ 0, 4, 2 ], "scale": [ 1.7, 1.7, 1.7 ] } - } } - } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/genetics/models/item/serumArray.json b/src/main/resources/assets/genetics/models/item/serumArray.json new file mode 100644 index 00000000..d11d4b02 --- /dev/null +++ b/src/main/resources/assets/genetics/models/item/serumArray.json @@ -0,0 +1,21 @@ +{ + "parent": "item/generated", + "textures": { + "layer0":"genetics:items/machines/genome.glass", + "layer1":"genetics:items/machines/genome.cap", + "layer2":"genetics:items/machines/genome.edges", + "layer3":"genetics:items/machines/genome.dna" + }, + "display": { + "thirdperson": { + "rotation": [ 0, 90, -35 ], + "translation": [ 0, 1.25, -3.5 ], + "scale": [ 0.85, 0.85, 0.85 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +}