From 2d3cd66680faec71df48b62ac0bda328e2bb5338 Mon Sep 17 00:00:00 2001 From: Player Date: Sat, 26 Apr 2014 21:55:04 +0200 Subject: [PATCH] Registry: Treat all 1.6 entries as items. --- .../cpw/mods/fml/common/FMLContainer.java | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/fml/src/main/java/cpw/mods/fml/common/FMLContainer.java b/fml/src/main/java/cpw/mods/fml/common/FMLContainer.java index eb3d3891f2..23f4327203 100644 --- a/fml/src/main/java/cpw/mods/fml/common/FMLContainer.java +++ b/fml/src/main/java/cpw/mods/fml/common/FMLContainer.java @@ -185,23 +185,8 @@ public class FMLContainer extends DummyModContainer implements WorldAccessContai } else { - boolean isItem; - try { - Class clazz = Class.forName(itemType); - clazz.asSubclass(Item.class); - isItem = true; - } - catch (ClassNotFoundException cnfs) - { - FMLLog.warning("The old item %s is not present in this game, it's type cannot be inferred - it will be skipped", itemType); - // MISSING, skip - continue; - } - catch (ClassCastException ccs) - { - isItem = false; - } - String itemLabel = String.format("%c%s:%s", isItem ? '\u0002' : '\u0001', forcedModId != null ? forcedModId : modId, forcedName); + // all entries are Items, blocks were only saved through their ItemBlock + String itemLabel = String.format("%c%s:%s", '\u0002', forcedModId != null ? forcedModId : modId, forcedName); dataList.put(itemLabel, itemId); } }