upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-13 16:54:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change a couple of warnings, as a prelude to 1.7- preinit is now required for all GameRegistry activity, and every item and block REQUIRES registration.

Browse Source
This commit is contained in:
Christian committed 2013-11-06 16:18:41 -05:00
1 parent 8f87021b0f
commit f4532410ec
2 files changed
+24 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

common/cpw/mods/fml/common/Loader.java
+1
View File
@@ -521,6 +521,7 @@ public class Loader
modController.transition(LoaderState.PREINITIALIZATION, false);
modController.distributeStateMessage(LoaderState.PREINITIALIZATION, disc.getASMTable(), canonicalConfigDir);
modController.transition(LoaderState.INITIALIZATION, false);
GameData.validateRegistry();
}
private void disableRequestedMods()
common/cpw/mods/fml/common/registry/GameData.java
+23 -2
View File
@@ -64,6 +64,7 @@ public class GameData {
private static ImmutableTable<String, String, Integer> modObjectTable;
private static Table<String, String, ItemStack> customItemStacks = HashBasedTable.create();
private static Map<String,String> ignoredMods;
private static boolean validated;
private static boolean isModIgnoredForIdValidation(String modId)
{
@@ -103,9 +104,9 @@ public class GameData {
if (mc == null)
{
mc = Loader.instance().getMinecraftModContainer();
if (Loader.instance().hasReachedState(LoaderState.AVAILABLE))
if (Loader.instance().hasReachedState(LoaderState.INITIALIZATION) || validated)
{
FMLLog.severe("It appears something has tried to allocate an Item outside of the initialization phase of Minecraft, this could be very bad for your network connectivity.");
FMLLog.severe("It appears something has tried to allocate an Item or Block outside of the preinitialization phase for mods. This will NOT work in 1.7 and beyond!");
}
}
String itemType = item.getClass().getName();
@@ -387,4 +388,24 @@ public class GameData {
return new UniqueIdentifier(itemData.getModId(), itemData.getItemType());
}
public static void validateRegistry()
{
for (int i = 0; i < Item.field_77698_e.length; i++)
{
if (Item.field_77698_e[i] != null)
{
ItemData itemData = idMap.get(i);
if (itemData == null)
{
FMLLog.severe("Found completely unknown item of class %s with ID %d, this will NOT work for a 1.7 upgrade", Item.field_77698_e[i].getClass().getName(), i);
}
else if (!itemData.isOveridden() && !"Minecraft".equals(itemData.getModId()))
{
FMLLog.severe("Found anonymous item of class %s with ID %d owned by mod %s, this item will NOT survive a 1.7 upgrade!", Item.field_77698_e[i].getClass().getName(), i, itemData.getModId());
}
}
}
validated = true;
}
}