diff --git a/build.xml b/build.xml index c202b5c0..9dabbf35 100644 --- a/build.xml +++ b/build.xml @@ -19,7 +19,26 @@ - + + + + + + + + + + + + + + + + + + + + @@ -41,6 +60,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -113,7 +159,7 @@ - + @@ -176,7 +222,7 @@ - + diff --git a/resources/mcmod.info b/resources/mcmod.info index 1f0153be..098e0072 100644 --- a/resources/mcmod.info +++ b/resources/mcmod.info @@ -24,7 +24,28 @@ "mcversion": "@MCVERSION@", "url": "http://www.minecraftforum.net/topic/1659892-tinkers-construct", "updateUrl": "", - "authors": [], + "authors": [ + "mDiyo", "fuj1n", "ProgWML6", "Sunstrike" + ], + "credits": "", + "logoFile": "", + "screenshots": [], + "parent":"TConstruct", + "dependencies": [ + "TConstruct" + ] + } + { + "modid": "TConstruct|CompatForgeMultiPart", + "name": "TConstruct Compat: FMP", + "description": "TConstruct support for forgemultipart", + "version": "@VERSION@", + "mcversion": "@MCVERSION@", + "url": "http://www.minecraftforum.net/topic/1659892-tinkers-construct", + "updateUrl": "", + "authors": [ + "mDiyo", "fuj1n", "ProgWML6", "Sunstrike" + ], "credits": "", "logoFile": "", "screenshots": [], diff --git a/src/tconstruct/plugins/fmp/ForgeMultiPart.java b/src/tconstruct/plugins/fmp/ForgeMultiPart.java new file mode 100644 index 00000000..25e7575e --- /dev/null +++ b/src/tconstruct/plugins/fmp/ForgeMultiPart.java @@ -0,0 +1,50 @@ +package tconstruct.plugins.fmp; + + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import cpw.mods.fml.common.*; +import cpw.mods.fml.common.Mod.EventHandler; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.network.NetworkMod; +import tconstruct.common.TContent; +import tconstruct.plugins.fmp.register.RegisterWithFMP; + + +@Mod(modid = "TConstruct|ForgeMuliPart", name = "TConstruct Compat: FMP", version = "0.1", dependencies = "after:ForgeMultipart;after:TConstruct") +@NetworkMod(clientSideRequired = false, serverSideRequired = false) +public class ForgeMultiPart { + @EventHandler + public static void load (FMLInitializationEvent ev) + { + if (!Loader.isModLoaded("ForgeMultipart")) + { + FMLLog.warning("Forgemultipart missing - TConstruct Compat: FMP not loading."); + + return; + } + try + { + FMLLog.fine("ForgeMultipart detected. Registering TConstruct decorative blocks with FMP."); + //register blocks without metadata here + RegisterWithFMP.registerBlock(TContent.clearGlass); + RegisterWithFMP.registerBlock(TContent.searedBlock); + //register blocks w/ metadata here + for (int x =0;x<=15;x++) + { + RegisterWithFMP.registerBlock(TContent.stainedGlassClear, x); + RegisterWithFMP.registerBlock(TContent.multiBrick,x); + RegisterWithFMP.registerBlock(TContent.metalBlock ,x); + RegisterWithFMP.registerBlock(TContent.multiBrickFancy, x); + + } + + } + catch (Exception e) + { + e.printStackTrace(); + } + } + + +} diff --git a/src/tconstruct/plugins/fmp/register/RegisterWithFMP.java b/src/tconstruct/plugins/fmp/register/RegisterWithFMP.java new file mode 100644 index 00000000..7ee9352b --- /dev/null +++ b/src/tconstruct/plugins/fmp/register/RegisterWithFMP.java @@ -0,0 +1,28 @@ +package tconstruct.plugins.fmp.register; + +import net.minecraft.block.Block; +import codechicken.microblock.BlockMicroMaterial; +import codechicken.microblock.MicroMaterialRegistry; + +public class RegisterWithFMP { + public static void registerBlock (Block block,int meta) + { + // meta = number 0->15 + String identifier = new String( block.getUnlocalizedName()); + MicroMaterialRegistry.registerMaterial(new BlockMicroMaterial(block, meta), identifier + meta); + // BlockMicroMaterial.createAndRegister(block); + + //MicroMaterialRegistry.registerMaterial((IMicroMaterial) block.blockMaterial, "tinkers:" + identifier + meta); + } + public static void registerBlock (Block block ) + { + //s = string identifier for meta ex: brick... + //MicroMaterialRegistry.registerMaterial(material, s + meta); + String identifier = new String( block.getUnlocalizedName()); + + //MicroMaterialRegistry.registerMaterial(new BlockMicroMaterial(block, 0), identifier ); + + //MicroMaterialRegistry.registerMaterial((IMicroMaterial) block.blockMaterial,"tinkers:" + identifier); + BlockMicroMaterial.createAndRegister(block); + } +}