Merge pull request #2064 from adudney/6.1.x

Fixed laser remapping
This commit is contained in:
Adrian Siekierka 2014-10-20 05:53:18 +02:00
commit 9d2cd3caa3

View file

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