Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2059 from AEnterprise/6.1.x

Browse source 
fix laserTables being mapped as "null" and remap them
This commit is contained in:
Adrian Siekierka 2014-10-19 10:25:00 +02:00
commit 5df3d14370
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
common/buildcraft/BuildCraftSilicon.java
View file

@ -19,6 +19,7 @@ import net.minecraft.item.ItemStack;
import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLInterModComms; import cpw.mods.fml.common.event.FMLInterModComms;
import cpw.mods.fml.common.event.FMLMissingMappingsEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.NetworkRegistry;
@ -186,6 +187,7 @@ public class BuildCraftSilicon extends BuildCraftMod {
CoreProxy.proxy.registerBlock(laserBlock); CoreProxy.proxy.registerBlock(laserBlock);
assemblyTableBlock = new BlockLaserTable(); assemblyTableBlock = new BlockLaserTable();
assemblyTableBlock.setBlockName("laserTableBlock");
CoreProxy.proxy.registerBlock(assemblyTableBlock, ItemLaserTable.class); CoreProxy.proxy.registerBlock(assemblyTableBlock, ItemLaserTable.class);
zonePlanBlock = new BlockZonePlan(); zonePlanBlock = new BlockZonePlan();
@ -601,4 +603,13 @@ public class BuildCraftSilicon extends BuildCraftMod {
FMLInterModComms.sendMessage("appliedenergistics2", "whitelist-spatial", FMLInterModComms.sendMessage("appliedenergistics2", "whitelist-spatial",
TileIntegrationTable.class.getCanonicalName()); TileIntegrationTable.class.getCanonicalName());
} }
@Mod.EventHandler
public void remap(FMLMissingMappingsEvent event) {
for (FMLMissingMappingsEvent.MissingMapping mapping: event.get()) {
if (mapping.name.equals("BuildCraft|Silicon:null"))
mapping.remap(laserBlock);
}
}
} }