Fix missing item/block event handling

This commit is contained in:
mezz committed 2017-07-12 22:47:26 -07:00
1 parent bf08336bc5
commit 1e7a042b53
2 files changed
+7 -15

No files matched your search

+1 -15
View File
@@ -15,12 +15,9 @@ import com.google.common.base.Preconditions;
import javax.annotation.Nullable;
import java.io.File;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.Mod.EventHandler;
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
@@ -44,7 +41,6 @@ import forestry.core.gui.GuiHandler;
import forestry.core.multiblock.MultiblockEventHandler;
import forestry.core.network.PacketHandler;
import forestry.core.proxy.Proxies;
import forestry.core.utils.MigrationHelper;
import forestry.core.worldgen.WorldGenerator;
import forestry.plugins.PluginManager;
import forestry.plugins.compat.PluginIC2;
@@ -151,14 +147,4 @@ public class Forestry {
public void processIMCMessages(IMCEvent event) {
PluginManager.processIMCMessages(event.getMessages());
}
@EventHandler
public void onMissingBlockMappings(RegistryEvent.MissingMappings<Block> event) {
MigrationHelper.onMissingBlockMappings(event);
}
@EventHandler
public void onMissingItemMappings(RegistryEvent.MissingMappings<Item> event) {
MigrationHelper.onMissingItemMappings(event);
}
}
@@ -13,8 +13,12 @@ import net.minecraft.item.Item;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.registry.ForgeRegistries;
@Mod.EventBusSubscriber
public class MigrationHelper {
private static Map<String, String> blockRemappings = new HashMap<>();
private static Map<String, String> itemRemappings = new HashMap<>();
@@ -51,6 +55,7 @@ public class MigrationHelper {
}
}
@SubscribeEvent
public static void onMissingBlockMappings(RegistryEvent.MissingMappings<Block> event) {
for (RegistryEvent.MissingMappings.Mapping<Block> missingMapping : event.getMappings()) {
ResourceLocation resourceLocation = missingMapping.key;
@@ -70,6 +75,7 @@ public class MigrationHelper {
}
}
@SubscribeEvent
public static void onMissingItemMappings(RegistryEvent.MissingMappings<Item> event) {
for (RegistryEvent.MissingMappings.Mapping<Item> missingMapping : event.getMappings()) {
ResourceLocation resourceLocation = missingMapping.key;