Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x

This commit is contained in:
asiekierka 2014-10-20 09:30:54 +02:00
commit 4d7bae1358

View file

@ -8,6 +8,7 @@
*/
package buildcraft;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
@ -531,7 +532,11 @@ public class BuildCraftSilicon extends BuildCraftMod {
public void remap(FMLMissingMappingsEvent event) {
for (FMLMissingMappingsEvent.MissingMapping mapping: event.get()) {
if (mapping.name.equals("BuildCraft|Silicon:null")) {
if (mapping.type == GameRegistry.Type.ITEM) {
mapping.remap(Item.getItemFromBlock(laserBlock));
} else {
mapping.remap(laserBlock);
}
}
}
}