mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-12 08:17:35 +00:00
Fix objloader registering at wrong time. Closes #5847. Added test
class as suggested in the issue. Note: most tests are commented out at the present time, pending rework. Tests that work, work. Signed-off-by: cpw <cpw+github@weeksfamily.ca>
This commit is contained in:
136 files changed
+636
-848
No files matched your search
@@ -63,7 +63,7 @@ public class ModelLoaderRegistry
|
||||
private static IResourceManager manager;
|
||||
|
||||
// Forge built-in loaders
|
||||
static
|
||||
public static void init()
|
||||
{
|
||||
registerLoader(B3DLoader.INSTANCE);
|
||||
registerLoader(OBJLoader.INSTANCE);
|
||||
|
||||
@@ -27,6 +27,7 @@ import net.minecraft.resources.*;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||
import net.minecraftforge.client.event.ModelRegistryEvent;
|
||||
import net.minecraftforge.client.model.ModelLoaderRegistry;
|
||||
import net.minecraftforge.common.ForgeConfig;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.eventbus.api.Event;
|
||||
@@ -68,6 +69,7 @@ public class ClientModLoader
|
||||
ResourcePackLoader.loadResourcePacks(defaultResourcePacks);
|
||||
mcResourceManager.addReloadListener(ClientModLoader::onreload);
|
||||
mcResourceManager.addReloadListener(BrandingControl.resourceManagerReloadListener());
|
||||
ModelLoaderRegistry.init();
|
||||
}
|
||||
|
||||
private static CompletableFuture<Void> onreload(final IFutureReloadListener.IStage stage, final IResourceManager resourceManager, final IProfiler prepareProfiler, final IProfiler executeProfiler, final Executor asyncExecutor, final Executor syncExecutor) {
|
||||
|
||||
Reference in new issue
Block a user