diff --git a/build.gradle b/build.gradle index 658c32c3..5edbf4cc 100644 --- a/build.gradle +++ b/build.gradle @@ -67,6 +67,7 @@ dependencies { compile "codechicken:CodeChickenLib:${config.minecraft_version}-${config.CCLIB_version}:dev" compile "codechicken:CodeChickenCore:${config.minecraft_version}-${config.ccc_version}:dev" compile "codechicken:NotEnoughItems:${config.minecraft_version}-${config.NEI_version}:dev" + compile "codechicken:ForgeMultipart:${config.minecraft_version}-${config.fmp_version}:dev" //compile "mcp.mobius.waila:Waila:${config.waila_version}:dev" deployerJars 'org.apache.maven.wagon:wagon-ssh:2.2' } diff --git a/build.properties b/build.properties index 632a042d..5da4c5be 100644 --- a/build.properties +++ b/build.properties @@ -5,4 +5,5 @@ CCLIB_version=1.1.1.99 NEI_version=1.0.3.66 ccc_version=1.0.4.29 mod_version=1.7.experimental -waila_version=1.5.3_1.7.10 \ No newline at end of file +waila_version=1.5.3_1.7.10 +fmp_version=1.1.0.314 \ No newline at end of file diff --git a/src/main/java/tconstruct/TConstruct.java b/src/main/java/tconstruct/TConstruct.java index 6989dfdc..0d9f1356 100644 --- a/src/main/java/tconstruct/TConstruct.java +++ b/src/main/java/tconstruct/TConstruct.java @@ -32,6 +32,7 @@ import tconstruct.library.crafting.LiquidCasting; import tconstruct.mechworks.TinkerMechworks; import tconstruct.mechworks.landmine.behavior.Behavior; import tconstruct.mechworks.landmine.behavior.stackCombo.SpecialStackHandler; +import tconstruct.plugins.fmp.TinkerFMP; import tconstruct.plugins.ic2.TinkerIC2; import tconstruct.plugins.imc.TinkerAE2; import tconstruct.plugins.imc.TinkerBuildCraft; @@ -134,6 +135,7 @@ public class TConstruct pulsar.registerPulse(new TinkerMystcraft()); pulsar.registerPulse(new TinkerMFR()); pulsar.registerPulse(new TinkerTE4()); + pulsar.registerPulse(new TinkerFMP()); /*pulsar.registerPulse(new TinkerPrayers()); pulsar.registerPulse(new TinkerCropify());*/ diff --git a/src/main/java/tconstruct/plugins/fmp/TinkerFMP.java b/src/main/java/tconstruct/plugins/fmp/TinkerFMP.java new file mode 100644 index 00000000..8016b34b --- /dev/null +++ b/src/main/java/tconstruct/plugins/fmp/TinkerFMP.java @@ -0,0 +1,56 @@ +package tconstruct.plugins.fmp; + +import codechicken.microblock.BlockMicroMaterial; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import mantle.pulsar.pulse.Handler; +import mantle.pulsar.pulse.Pulse; +import tconstruct.TConstruct; +import tconstruct.smeltery.TinkerSmeltery; +import tconstruct.tools.TinkerTools; +import tconstruct.world.TinkerWorld; + +@Pulse(id = "Tinkers FMP Compatibility", description = "Makes Tinkers Blocks Multipart compatible", modsRequired = "ForgeMultipart", forced = true) +public class TinkerFMP { + @Handler + public void init(FMLInitializationEvent event) + { + + TConstruct.logger.info("ForgeMultipart detected. Registering TConstruct decorative blocks with FMP."); + + //make Tconstruct blocks multipartable! + if(TinkerWorld.metalBlock != null) { + // metal blocks + for (int i = 0; i < 11; i++) + BlockMicroMaterial.createAndRegister(TinkerWorld.metalBlock, i); + } + + if(TinkerSmeltery.smeltery != null) { + // smeltery bricks + for (int i = 2; i < 12; i++) { + if (i == 3) + continue; + BlockMicroMaterial.createAndRegister(TinkerSmeltery.smeltery, i); + BlockMicroMaterial.createAndRegister(TinkerSmeltery.smelteryNether, i, TinkerSmeltery.smelteryNether.getUnlocalizedName() + "Nether"); + } + + // brownstone + for (int i = 0; i < 7; i++) + BlockMicroMaterial.createAndRegister(TinkerSmeltery.speedBlock, i); + + // clear glass + BlockMicroMaterial.createAndRegister(TinkerSmeltery.clearGlass, 0); + for (int i = 0; i < 16; i++) + BlockMicroMaterial.createAndRegister(TinkerSmeltery.stainedGlassClear, i); + } + + if(TinkerTools.multiBrick != null) { + // chisel bricks + for (int i = 0; i < 14; i++) + BlockMicroMaterial.createAndRegister(TinkerTools.multiBrick, i); + + for (int i = 0; i < 16; i++) + BlockMicroMaterial.createAndRegister(TinkerTools.multiBrickFancy, i); + } + + } +}