diff --git a/build.gradle b/build.gradle index dd32cbbb7..fbb81c44b 100644 --- a/build.gradle +++ b/build.gradle @@ -61,6 +61,7 @@ dependencies { compile "codechicken:CodeChickenLib:1.7.10-1.1.1.95:dev" compile "codechicken:CodeChickenCore:1.7.10-1.0.2.9:dev" compile "codechicken:NotEnoughItems:1.7.10-1.0.2.15:dev" + compile "codechicken:ForgeMultipart:1.7.10-1.1.1.320:dev" //and a bit more for FTP ftpAntTask module("org.apache.ant:ant-commons-net:1.7.0") { diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 8baf7d198..fd15b727e 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -160,6 +160,7 @@ import vazkii.botania.common.block.tile.string.TileRedStringRelay; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibOreDict; +import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; public final class ModBlocks { @@ -467,6 +468,15 @@ public final class ModBlocks { registerSubTileWithMini(LibBlockNames.SUBTILE_BUBBELL, SubTileBubbell.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_SOLEGNOLIA, SubTileSolegnolia.class); } + + public static void registerMultiparts() { + if(Loader.isModLoaded("ForgeMultipart")) { + try { + Class clazz = Class.forName("vazkii.botania.common.integration.multipart.MultipartHandler"); + clazz.newInstance(); + } catch(Throwable e) {} + } + } private static void registerSubTileWithMini(String key, Class clazz) { BotaniaAPI.registerSubTile(key, clazz); diff --git a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java index c701b7b51..af00047b3 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java @@ -137,6 +137,7 @@ public class CommonProxy { } ModBlocks.addDispenserBehaviours(); + ModBlocks.registerMultiparts(); ConfigHandler.loadPostInit(); LexiconData.postInit(); diff --git a/src/main/java/vazkii/botania/common/integration/multipart/MultipartHandler.java b/src/main/java/vazkii/botania/common/integration/multipart/MultipartHandler.java new file mode 100644 index 000000000..0cd330ecf --- /dev/null +++ b/src/main/java/vazkii/botania/common/integration/multipart/MultipartHandler.java @@ -0,0 +1,75 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Sep 1, 2015, 5:32:15 PM (GMT)] + */ +package vazkii.botania.common.integration.multipart; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.ModFluffBlocks; +import codechicken.microblock.BlockMicroMaterial; +import codechicken.microblock.MicroMaterialRegistry; + +public class MultipartHandler { + + public MultipartHandler() { + registerAllMultiparts(ModBlocks.livingrock); + registerAllMultiparts(ModBlocks.livingwood); + registerAllMultiparts(ModBlocks.storage); + registerAllMultiparts(ModBlocks.dreamwood); + registerAllMultiparts(ModBlocks.livingrock); + registerAllMultiparts(ModBlocks.prismarine); + registerAllMultiparts(ModBlocks.seaLamp); + registerAllMultiparts(ModBlocks.reedBlock); + registerAllMultiparts(ModBlocks.thatch); + registerAllMultiparts(ModBlocks.customBrick); + registerAllMultiparts(ModBlocks.elfGlass); + registerAllMultiparts(ModBlocks.manaGlass); + registerAllMultiparts(ModBlocks.endStoneBrick); + registerAllMultiparts(ModBlocks.blazeBlock); + registerAllMultiparts(ModBlocks.livingrock); + registerAllMultiparts(ModBlocks.bifrostPerm); + + registerAllMultiparts(ModFluffBlocks.darkQuartz); + registerAllMultiparts(ModFluffBlocks.manaQuartz); + registerAllMultiparts(ModFluffBlocks.blazeQuartz); + registerAllMultiparts(ModFluffBlocks.lavenderQuartz); + registerAllMultiparts(ModFluffBlocks.redQuartz); + registerAllMultiparts(ModFluffBlocks.elfQuartz); + registerAllMultiparts(ModFluffBlocks.sunnyQuartz); + registerAllMultiparts(ModFluffBlocks.biomeStoneA); + registerAllMultiparts(ModFluffBlocks.biomeStoneB); + registerAllMultiparts(ModFluffBlocks.stone); + } + + private static void registerAllMultiparts(Block block) { + List stacks = new ArrayList(); + Item item = Item.getItemFromBlock(block); + block.getSubBlocks(item, block.getCreativeTabToDisplayOn(), stacks); + + for(ItemStack stack : stacks) + if(stack.getItem() == item) + registerMultipart(block, stack.getItemDamage()); + } + + private static void registerMultipartMetadataLine(Block block, int maxMeta) { + for(int i = 0; i < maxMeta; i++) + registerMultipart(block, i); + } + + private static void registerMultipart(Block block, int meta) { + MicroMaterialRegistry.registerMaterial(new BlockMicroMaterial(block, meta), block.getUnlocalizedName() + (meta == 0 ? "" : "_" + meta)); + } + +} \ No newline at end of file