added in FMP plugin , tested code with and without fmp installed

This commit is contained in:
progwml6 committed 2013-09-30 23:07:14 -04:00
1 parent abdd27c235
commit df6eaf4dfc
4 files changed
+149 -4

No files matched your search

+49 -3
View File
@@ -19,7 +19,26 @@
<property name="mc.version" value="1.6.4"/>
<property name="forge.version" value="9.11.0.880"/>
<!-- FMP stuff - copied from projectred w/ CB's permission -->
<property name="ccl.version" value="1.0.0.36" />
<property name="fmp.version" value="1.0.0.182" />
<property name="ccl.name" value="CodeChickenLib-dev-${mc.version}-${ccl.version}.jar" />
<property name="fmp.name" value="ForgeMultipart-dev-${mc.version}-${fmp.version}.jar" />
<available property="fmp-downloaded" file="${download.dir}/${fmp.name}" />
<available property="ccl-downloaded" file="${download.dir}/${ccl.name}" />
<condition property="ccl-installed">
<and>
<isset property="forge-installed" />
<equals arg1="${build.dependencies.ccl}" arg2="${ccl.version}" />
</and>
</condition>
<condition property="fmp-installed">
<and>
<isset property="forge-installed" />
<equals arg1="${build.dependencies.fmp}" arg2="${fmp.version}" />
</and>
</condition>
<property name="version.major" value="0"/>
<property name="version.minor" value="0"/>
@@ -41,6 +60,33 @@
<!-- Targets -->
<!-- Targets FMP stuff from ProjectRed w/ CB's Permission -->
<target name="download-ccl" unless="ccl-downloaded">
<get src="http://files.minecraftforge.net/CodeChickenLib/${ccl.name}" dest="${download.dir}" usetimestamp="true" />
</target>
<target name="install-ccl" depends="setup,download-ccl" unless="ccl-installed">
<echo message="Deleting old CodeChickenLib" />
<delete file="${mcp.dir}/lib/${build.dependencies.ccl.name}" />
<echo message="Installing CodeChickenLib" />
<copy file="${download.dir}/${ccl.name}" todir="${mcp.dir}/lib" />
</target>
<target name="install-fmp" depends="setup,download-fmp" unless="fmp-installed">
<echo message="Deleting old ForgeMultipart" />
<delete file="${mcp.dir}/lib/${build.dependencies.fmp.name}" />
<echo message="Installing ForgeMultipart" />
<copy file="${download.dir}/${fmp.name}" todir="${mcp.dir}/lib" />
</target>
<target name="install-deps" depends="install-ccl,install-fmp" />
<target name="download-fmp" unless="fmp-downloaded">
<get src="http://files.minecraftforge.net/ForgeMultipart/${fmp.name}" dest="${download.dir}" usetimestamp="true" />
</target>
<!-- Clear build directory -->
<target name="clean">
<delete dir="${build.dir}"/>
@@ -113,7 +159,7 @@
</copy>
</target>
<target name="compile" depends="initialize-version,setup,copy-src">
<target name="compile" depends="initialize-version,install-deps,setup,copy-src">
<delete dir="${classes.dir}"/>
<mkdir dir="${classes.dir}"/>
@@ -176,7 +222,7 @@
<delete dir="${mcpsrc.dir}/minecraft/sparrow"/>
<delete dir="${mcpsrc.dir}/minecraft/powercrystals"/>
<delete dir="${mcpsrc.dir}/minecraft/ic2"/>
<delete dir="${mcpsrc.dir}/minecraft/codechicken"/>
</target>
<!-- Package the compiled files -->
+22 -1
View File
@@ -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": [],
@@ -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();
}
}
}
@@ -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);
}
}