Some more stuffs. ObjectHolder's replacement?

This commit is contained in:
cpw authored and LexManos committed 2018-09-05 11:58:31 -07:00
1 parent baa9dfe55a
commit 06b16aaa19
47 files changed
+987 -269

No files matched your search

@@ -83,6 +83,8 @@ import javax.annotation.Nullable;
import org.apache.commons.lang3.Validate;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import static net.minecraftforge.fml.Logging.fmlLog;
@@ -116,6 +118,7 @@ public class GameData
private static final ResourceLocation BLOCK_TO_ITEM = new ResourceLocation("minecraft:blocktoitemmap");
private static final ResourceLocation BLOCKSTATE_TO_ID = new ResourceLocation("minecraft:blockstatetoid");
private static final Logger LOGGER = LogManager.getLogger("FML");
private static boolean hasInit = false;
private static final boolean DISABLE_VANILLA_REGISTRIES = Boolean.parseBoolean(System.getProperty("forge.disableVanillaGameData", "false")); // Use for unit tests/debugging
private static final BiConsumer<ResourceLocation, ForgeRegistry<?>> LOCK_VANILLA = (name, reg) -> reg.slaves.values().stream().filter(o -> o instanceof ILockableRegistry).forEach(o -> ((ILockableRegistry)o).lock());
@@ -563,8 +566,7 @@ public class GameData
}
else if (isLocalWorld)
{
if (ForgeRegistry.DEBUG)
FMLLog.log.debug("Registry {}: Resuscitating dummy entry {}", key, dummy);
LOGGER.debug("Registry {}: Resuscitating dummy entry {}", key, dummy);
}
else
{
@@ -751,12 +753,10 @@ public class GameData
if (filter.test(BLOCKS))
{
MinecraftForge.EVENT_BUS.post(RegistryManager.ACTIVE.getRegistry(BLOCKS).getRegisterEvent(BLOCKS));
ObjectHolderRegistry.INSTANCE.applyObjectHolders(); // inject any blocks
}
if (filter.test(ITEMS))
{
MinecraftForge.EVENT_BUS.post(RegistryManager.ACTIVE.getRegistry(ITEMS).getRegisterEvent(ITEMS));
ObjectHolderRegistry.INSTANCE.applyObjectHolders(); // inject any items
}
for (ResourceLocation rl : keys)
{
@@ -764,7 +764,6 @@ public class GameData
if (rl == BLOCKS || rl == ITEMS) continue;
MinecraftForge.EVENT_BUS.post(RegistryManager.ACTIVE.getRegistry(rl).getRegisterEvent(rl));
}
ObjectHolderRegistry.INSTANCE.applyObjectHolders(); // inject everything else
/*