Fix FMP integration. All normal blocks are now auto registered.

Fixes #89
Fixes #93
This commit is contained in:
tterrag1098 committed 2015-01-12 23:52:53 -05:00
1 parent 9d63c73e99
commit 1920feeb1d
9 files changed
+59 -257

No files matched your search

@@ -1,5 +1,7 @@
package com.cricketcraft.chisel.compat;
import net.minecraft.block.Block;
import com.cricketcraft.chisel.carving.Carving;
import cpw.mods.fml.common.Loader;
@@ -8,12 +10,30 @@ import cpw.mods.fml.common.registry.GameRegistry;
public class Compatibility {
public static void init(FMLPostInitializationEvent event) {
new VariationCompat().postInit(event);
public static String[] rockColorNames = { "gray", "lightgray", "brown", "tan", "reddish", "bluish", "greenish" };
public static void init(FMLPostInitializationEvent event) {
/* Proj Red */
addSupport("ProjRed|Exploration", "projectred.exploration.stone", "marble", 0, 99);
/* Bluepower */
addSupport("bluepower", "marble", "marble", 0, 99);
/* Artifice */
addSupport("Artifice", "artifice.marble", "marble", 0, 99);
addSupport("Artifice", "artifice.marble.slab", "marble_slab", 0, 99);
for (String s : rockColorNames) {
addSupport("Artifice", "artifice.limestone." + s, "limestone", 0, 99);
}
/* Mariculture */
Block block = GameRegistry.findBlock("mariculture", "limestone");
for (int i = 0; i < 16; i++) {
addSupport("limestone", block, i, 99);
}
/* Geologica */
addSupport("PFAAGeologica", "strongStone", "marble", 5, 99);
addSupport("PFAAGeologica", "strongStoneSlab", "marbleSlab", 5, 99);
addSupport("PFAAGeologica", "strongStoneBrickStairs.marble", "marbleStairs", 0, 99);
@@ -26,7 +46,11 @@ public class Compatibility {
public static void addSupport(String modname, String blockname, String name, int metadata, int order) {
if (Loader.isModLoaded(modname) && GameRegistry.findBlock(modname, blockname) != null) {
Carving.chisel.addVariation(name, GameRegistry.findBlock(modname, blockname), metadata, order);
addSupport(name, GameRegistry.findBlock(modname, blockname), metadata, order);
}
}
public static void addSupport(String name, Block block, int metadata, int order) {
Carving.chisel.addVariation(name, block, metadata, order);
}
}
@@ -2,102 +2,21 @@ package com.cricketcraft.chisel.compat;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import com.cricketcraft.chisel.compat.ModIntegration.IModIntegration;
import com.cricketcraft.chisel.init.ChiselBlocks;
import cpw.mods.fml.common.event.FMLInterModComms;
public class FMPIntegration implements IModIntegration {
@Override
public String getModId() {
return "ForgeMicroblock";
public class FMPIntegration {
public static void registerFMP(Block block) {
registerFMP(block, 0, 15);
}
@Override
public void onInit() {
registerMaterial(ChiselBlocks.marble);
registerMaterial(ChiselBlocks.limestone);
registerMaterial(ChiselBlocks.cobblestone, 1, 15);
registerMaterial(ChiselBlocks.glass, 1, 15);
registerMaterial(ChiselBlocks.sandstone, 3, 15);
registerMaterial(ChiselBlocks.sand_snakestone, 1, 1);
registerMaterial(ChiselBlocks.sand_snakestone, 13, 13);
registerMaterial(ChiselBlocks.sandstone_scribbles);
registerMaterial(ChiselBlocks.concrete, 0, 10);
registerMaterial(ChiselBlocks.iron_block, 1, 15);
registerMaterial(ChiselBlocks.gold_block, 1, 14);
registerMaterial(ChiselBlocks.diamond_block, 1, 12);
registerMaterial(ChiselBlocks.glowstone, 1, 15); // This is glowstone
registerMaterial(ChiselBlocks.lapis_block, 1, 8);
registerMaterial(ChiselBlocks.emerald_block, 1, 11);
registerMaterial(ChiselBlocks.nether_brick, 1, 5);
registerMaterial(ChiselBlocks.netherrack, 1, 14);
registerMaterial(ChiselBlocks.mossy_cobblestone, 1, 15);
registerMaterial(ChiselBlocks.stonebricksmooth, 4, 15);
registerMaterial(ChiselBlocks.stone_snakestone, 1, 1);
registerMaterial(ChiselBlocks.stone_snakestone, 13, 13);
registerMaterial(ChiselBlocks.dirt, 0, 3);
registerMaterial(ChiselBlocks.dirt, 6, 7);
registerMaterial(ChiselBlocks.dirt, 11, 11);
registerMaterial(ChiselBlocks.ice, 1, 15);
registerMaterial(ChiselBlocks.ice_pillar);
for (int x = 0; x < 4; x++) {
registerMaterial(ChiselBlocks.planks[x], 1, 15); // Oak, Spruce, Birch
// and Jungle
}
// Accacia
registerMaterial(ChiselBlocks.planks[4], 1, 1);
registerMaterial(ChiselBlocks.planks[4], 2, 2);
registerMaterial(ChiselBlocks.planks[4], 6, 6);
registerMaterial(ChiselBlocks.planks[4], 8, 11);
registerMaterial(ChiselBlocks.planks[4], 13, 13);
// Dark Oak
registerMaterial(ChiselBlocks.planks[5], 1, 1);
registerMaterial(ChiselBlocks.planks[5], 2, 2);
registerMaterial(ChiselBlocks.planks[5], 6, 6);
registerMaterial(ChiselBlocks.planks[5], 8, 11);
registerMaterial(ChiselBlocks.planks[5], 13, 13);
registerMaterial(ChiselBlocks.obsidian, 1, 15);
registerMaterial(ChiselBlocks.obsidian_snakestone, 1, 1);
registerMaterial(ChiselBlocks.obsidian_snakestone, 13, 13);
registerMaterial(ChiselBlocks.redstone_block, 1, 15);
registerMaterial(ChiselBlocks.holystone, 0, 13);
registerMaterial(ChiselBlocks.carpet_block);
registerMaterial(ChiselBlocks.lavastone, 0, 6);
registerMaterial(ChiselBlocks.fantasyblock, 0, 1);
registerMaterial(ChiselBlocks.fantasyblock, 3, 14);
registerMaterial(ChiselBlocks.tyrian);
registerMaterial(ChiselBlocks.templeblock, 1, 2);
registerMaterial(ChiselBlocks.templeblock, 4, 15);
registerMaterial(ChiselBlocks.mossy_templeblock, 1, 2);
registerMaterial(ChiselBlocks.mossy_templeblock, 4, 15);
registerMaterial(ChiselBlocks.factoryblock, 0, 12);
registerMaterial(ChiselBlocks.factoryblock, 14, 14);
registerMaterial(ChiselBlocks.stainedGlass[0]); // White
registerMaterial(ChiselBlocks.woolen_clay);
registerMaterial(ChiselBlocks.laboratoryblock, 2, 3);
registerMaterial(ChiselBlocks.laboratoryblock, 5, 12);
registerMaterial(ChiselBlocks.voidstone, 0, 3);
registerMaterial(ChiselBlocks.voidstone, 12, 15);
registerMaterial(ChiselBlocks.waterstone);
}
@Override
public void onPostInit() {
}
private void registerMaterial(Block block) {
registerMaterial(block, 0, 15);
}
private void registerMaterial(Block block, int minMeta, int maxMeta) {
public static void registerFMP(Block block, int minMeta, int maxMeta) {
for (int c = minMeta; c <= maxMeta; c++) {
FMLInterModComms.sendMessage(getModId(), "microMaterial", new ItemStack(block, 1, c));
registerFMP(block, c);
}
}
public static void registerFMP(Block block, int meta) {
FMLInterModComms.sendMessage("ForgeMicroblock", "microMaterial", new ItemStack(block, 1, meta));
}
}
@@ -1,52 +0,0 @@
package com.cricketcraft.chisel.compat;
import java.util.ArrayList;
import java.util.List;
import cpw.mods.fml.common.Loader;
public class ModIntegration {
private static List<IModIntegration> integratedMods = new ArrayList<IModIntegration>();
public static void addMod(Class<? extends IModIntegration> cls) {
try {
IModIntegration obj = cls.newInstance();
if (Loader.isModLoaded(obj.getModId())) {
integratedMods.add(obj);
}
} catch (Throwable throwable) {
throwable.printStackTrace();
}
}
public static void init() {
try {
for (IModIntegration integration : integratedMods) {
integration.onInit();
}
} catch (Throwable throwable) {
throwable.printStackTrace();
}
}
public static void postInit() {
try {
for (IModIntegration integration : integratedMods) {
integration.onPostInit();
}
} catch (Throwable throwable) {
throwable.printStackTrace();
}
}
static interface IModIntegration {
String getModId();
void onInit();
void onPostInit();
}
}
@@ -1,53 +0,0 @@
package com.cricketcraft.chisel.compat;
import java.util.List;
import net.minecraft.block.Block;
import org.apache.commons.lang3.tuple.Triple;
import com.cricketcraft.chisel.carving.Carving;
import com.google.common.collect.Lists;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.registry.GameRegistry;
public class VariationCompat {
public static String[] rockColorNames = { "gray", "lightgray", "brown", "tan", "reddish", "bluish", "greenish" };
public void postInit(FMLPostInitializationEvent event) {
// block, metadata, category
List<Triple<Block, Integer, String>> blocks = Lists.newArrayList();
/* Artifice */
blocks.add(Triple.of(find("Artifice", "artifice.marble"), 0, "marble"));
blocks.add(Triple.of(find("Artifice", "artifice.marble.slab"), 0, "marble_slab"));
for (String s : rockColorNames) {
blocks.add(Triple.of(find("Artifice", "artifice.limestone." + s), 0, "limestone"));
}
/* BluePower */
blocks.add(Triple.of(find("bluepower", "marble"), 0, "marble"));
/* Mariculture */
Block block = find("mariculture", "limestone");
for (int i = 0; i < 16; i++) {
blocks.add(Triple.of(block, i, "limestone"));
}
registerAll(blocks);
}
private void registerAll(List<Triple<Block, Integer, String>> blocks) {
for (Triple<Block, Integer, String> t : blocks) {
if (t.getRight() != null) {
Carving.chisel.addVariation(t.getRight(), t.getLeft(), t.getMiddle(), 99);
}
}
}
private Block find(String modid, String block) {
return GameRegistry.findBlock(modid, block);
}
}