mirror of
https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git
synced 2026-01-25 10:32:49 +00:00
Merge pull request #2270 from Toshayo/microblocks
Added Forge MicroBlocks support
This commit is contained in:
commit
ca3af9e863
@ -0,0 +1,77 @@
|
||||
package com.hbm.handler.microblocks;
|
||||
|
||||
import com.hbm.blocks.ModBlocks;
|
||||
import cpw.mods.fml.common.event.FMLInterModComms;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
public class MicroBlocksCompatHandler {
|
||||
public static void preInit() {
|
||||
registerMicroBlockCompat(ModBlocks.basalt);
|
||||
registerMicroBlockCompat(ModBlocks.basalt_smooth);
|
||||
registerMicroBlockCompat(ModBlocks.basalt_brick);
|
||||
registerMicroBlockCompat(ModBlocks.basalt_polished);
|
||||
registerMicroBlockCompat(ModBlocks.basalt_tiles);
|
||||
|
||||
registerMicroBlockCompat(ModBlocks.deco_titanium);
|
||||
registerMicroBlockCompat(ModBlocks.deco_red_copper);
|
||||
registerMicroBlockCompat(ModBlocks.deco_tungsten);
|
||||
registerMicroBlockCompat(ModBlocks.deco_aluminium);
|
||||
registerMicroBlockCompat(ModBlocks.deco_steel);
|
||||
registerMicroBlockCompat(ModBlocks.deco_rusty_steel);
|
||||
registerMicroBlockCompat(ModBlocks.deco_lead);
|
||||
registerMicroBlockCompat(ModBlocks.deco_beryllium);
|
||||
registerMicroBlockCompat(ModBlocks.deco_asbestos);
|
||||
registerMicroBlockCompat(ModBlocks.deco_rbmk);
|
||||
registerMicroBlockCompat(ModBlocks.deco_rbmk_smooth);
|
||||
|
||||
registerMicroBlockCompat(ModBlocks.asphalt);
|
||||
registerMicroBlockCompat(ModBlocks.asphalt_light);
|
||||
|
||||
registerMicroBlockCompat(ModBlocks.reinforced_brick);
|
||||
registerMicroBlockCompat(ModBlocks.reinforced_ducrete);
|
||||
registerMicroBlockCompat(ModBlocks.reinforced_sand);
|
||||
|
||||
registerMicroBlockCompat(ModBlocks.reinforced_stone);
|
||||
registerMicroBlockCompat(ModBlocks.concrete_smooth);
|
||||
registerMicroBlockCompat(ModBlocks.concrete_colored);
|
||||
registerMicroBlockCompat(ModBlocks.concrete_colored_ext);
|
||||
registerMicroBlockCompat(ModBlocks.concrete);
|
||||
registerMicroBlockCompat(ModBlocks.concrete_asbestos);
|
||||
registerMicroBlockCompat(ModBlocks.concrete_super);
|
||||
registerMicroBlockCompat(ModBlocks.concrete_super_broken);
|
||||
registerMicroBlockCompat(ModBlocks.ducrete_smooth);
|
||||
registerMicroBlockCompat(ModBlocks.ducrete);
|
||||
registerMicroBlockCompat(ModBlocks.concrete_pillar);
|
||||
registerMicroBlockCompat(ModBlocks.brick_concrete);
|
||||
registerMicroBlockCompat(ModBlocks.brick_concrete_mossy);
|
||||
registerMicroBlockCompat(ModBlocks.brick_concrete_cracked);
|
||||
registerMicroBlockCompat(ModBlocks.brick_concrete_broken);
|
||||
registerMicroBlockCompat(ModBlocks.brick_concrete_marked);
|
||||
registerMicroBlockCompat(ModBlocks.brick_ducrete);
|
||||
registerMicroBlockCompat(ModBlocks.brick_obsidian);
|
||||
registerMicroBlockCompat(ModBlocks.brick_light);
|
||||
registerMicroBlockCompat(ModBlocks.brick_compound);
|
||||
registerMicroBlockCompat(ModBlocks.brick_asbestos);
|
||||
registerMicroBlockCompat(ModBlocks.brick_fire);
|
||||
registerMicroBlockCompat(ModBlocks.lightstone);
|
||||
|
||||
registerMicroBlockCompat(ModBlocks.cmb_brick);
|
||||
registerMicroBlockCompat(ModBlocks.cmb_brick_reinforced);
|
||||
registerMicroBlockCompat(ModBlocks.vinyl_tile);
|
||||
|
||||
registerMicroBlockCompat(ModBlocks.tile_lab);
|
||||
registerMicroBlockCompat(ModBlocks.tile_lab_cracked);
|
||||
registerMicroBlockCompat(ModBlocks.tile_lab_broken);
|
||||
}
|
||||
|
||||
private static void registerMicroBlockCompat(Block block) {
|
||||
for(int meta = 0; meta < 15; meta++) {
|
||||
registerMicroBlockCompat(block, meta);
|
||||
}
|
||||
}
|
||||
|
||||
private static void registerMicroBlockCompat(Block block, int meta) {
|
||||
FMLInterModComms.sendMessage("ForgeMicroblock", "microMaterial", new ItemStack(block, 1, meta));
|
||||
}
|
||||
}
|
||||
@ -18,6 +18,7 @@ import com.hbm.handler.imc.IMCBlastFurnace;
|
||||
import com.hbm.handler.imc.IMCCentrifuge;
|
||||
import com.hbm.handler.imc.IMCCrystallizer;
|
||||
import com.hbm.handler.imc.IMCHandler;
|
||||
import com.hbm.handler.microblocks.MicroBlocksCompatHandler;
|
||||
import com.hbm.handler.neutron.NeutronHandler;
|
||||
import com.hbm.handler.pollution.PollutionHandler;
|
||||
import com.hbm.handler.radiation.ChunkRadiationManager;
|
||||
@ -661,6 +662,8 @@ public class MainRegistry {
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
MicroBlocksCompatHandler.preInit();
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
@ -905,14 +908,14 @@ public class MainRegistry {
|
||||
Compat.handleRailcraftNonsense();
|
||||
SuicideThreadDump.register();
|
||||
CommandReloadClient.register();
|
||||
|
||||
|
||||
// to make sure that foreign registered fluids are accounted for,
|
||||
// even when the reload listener is registered too late due to load order
|
||||
Fluids.reloadFluids();
|
||||
|
||||
//ExplosionTests.runTest();
|
||||
}
|
||||
|
||||
|
||||
@EventHandler
|
||||
public void preInit(FMLPreInitializationEvent event) {
|
||||
if(logger == null)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user