From 07c0927083e4498f6e15a0affec238166db188d7 Mon Sep 17 00:00:00 2001 From: CovertJaguar Date: Mon, 25 Aug 2014 17:19:29 -0700 Subject: [PATCH] Add MissingMapping handling (untested) Closes #133 --- api | 2 +- lang | 2 +- src/main/java/forestry/Forestry.java | 47 +++++++++++++++++++++++++--- 3 files changed, 44 insertions(+), 7 deletions(-) diff --git a/api b/api index 3f6be6bfc..6720bd4ae 160000 --- a/api +++ b/api @@ -1 +1 @@ -Subproject commit 3f6be6bfc53538ae723d14f3e9c5556788f31488 +Subproject commit 6720bd4aee8e7951ec3b0a6c4c5aaca4af136d82 diff --git a/lang b/lang index f6643624e..37b482690 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit f6643624ef3b3c219e2d6961fdf990e8d13b635c +Subproject commit 37b482690038b2d1c56a97bf99bc3dfcd50bd0a4 diff --git a/src/main/java/forestry/Forestry.java b/src/main/java/forestry/Forestry.java index 9d6f077b5..31b23ff2b 100755 --- a/src/main/java/forestry/Forestry.java +++ b/src/main/java/forestry/Forestry.java @@ -15,10 +15,13 @@ import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLInterModComms.IMCEvent; +import cpw.mods.fml.common.event.FMLMissingMappingsEvent; +import cpw.mods.fml.common.event.FMLMissingMappingsEvent.MissingMapping; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLServerStartingEvent; - +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.GameRegistry.Type; import forestry.api.fuels.EngineBronzeFuel; import forestry.api.fuels.EngineCopperFuel; import forestry.api.fuels.FermenterFuel; @@ -27,10 +30,15 @@ import forestry.api.fuels.MoistenerFuel; import forestry.api.fuels.RainSubstrate; import forestry.core.ForestryCore; import forestry.core.config.Defaults; +import forestry.core.config.ForestryItem; import forestry.core.config.Version; import forestry.core.network.PacketHandler; +import forestry.core.proxy.Proxies; import forestry.core.utils.FluidMap; import forestry.core.utils.ItemStackMap; +import forestry.core.utils.StringUtil; +import net.minecraft.block.Block; +import net.minecraft.item.Item; /** * Forestry Minecraft Mod @@ -42,10 +50,10 @@ import forestry.core.utils.ItemStackMap; name = "Forestry", version = Version.VERSION, dependencies = "required-after:Forge@[10.13.0.1180,);" - + "after:Buildcraft|Core;" - + "after:ExtrabiomesXL;" - + "after:BiomesOPlenty;" - + "after:IC2") + + "after:Buildcraft|Core;" + + "after:ExtrabiomesXL;" + + "after:BiomesOPlenty;" + + "after:IC2") //, certificateFingerprint = Version.FINGERPRINT) public class Forestry { @@ -96,4 +104,33 @@ public class Forestry { public void processIMCMessages(IMCEvent event) { core.processIMCMessages(event.getMessages()); } + + @EventHandler + public void missingMapping(FMLMissingMappingsEvent event) { + for (MissingMapping mapping : event.get()) + if (mapping.type == Type.BLOCK) { + Block block = GameRegistry.findBlock(Defaults.MOD, StringUtil.cleanTags(mapping.name)); + if (block != null) { + mapping.remap(block); + Proxies.log.warning("Remapping block " + mapping.name + " to " + StringUtil.cleanBlockName(block)); + } + } else { + Block block = GameRegistry.findBlock(Defaults.MOD, StringUtil.cleanTags(mapping.name)); + if (block != null) { + mapping.remap(Item.getItemFromBlock(block)); + Proxies.log.warning("Remapping item " + mapping.name + " to " + StringUtil.cleanBlockName(block)); + continue; + } + if (mapping.name.equals("builderBackpack")) + mapping.remap(ForestryItem.builderBackpack.item()); + if (mapping.name.equals("builderBackpackT2")) + mapping.remap(ForestryItem.builderBackpackT2.item()); + if (mapping.name.equals("adventurerBackpack")) + mapping.remap(ForestryItem.adventurerBackpack.item()); + if (mapping.name.equals("adventurerBackpackT2")) + mapping.remap(ForestryItem.adventurerBackpackT2.item()); + if (mapping.name.equals("shortMead")) + mapping.remap(ForestryItem.beverage.item()); + } + } }