Don't cache OBJ and B3D models. Throw model loading errors immediately. (#5758)

This commit is contained in:
Unnoen authored and LexManos committed 2019-08-02 14:16:20 -07:00
1 parent dac053415b
commit f8d32a8525
2 files changed
+45 -65

No files matched your search

@@ -100,7 +100,6 @@ public enum B3DLoader implements ICustomModelLoader
private IResourceManager manager;
private final Set<String> enabledDomains = new HashSet<>();
private final Map<ResourceLocation, B3DModel> cache = new HashMap<>();
public void addDomain(String domain)
{
@@ -111,7 +110,6 @@ public enum B3DLoader implements ICustomModelLoader
public void onResourceManagerReload(IResourceManager manager)
{
this.manager = manager;
cache.clear();
}
@Override
@@ -125,38 +123,33 @@ public enum B3DLoader implements ICustomModelLoader
public IModel loadModel(ResourceLocation modelLocation) throws Exception
{
ResourceLocation file = new ResourceLocation(modelLocation.getResourceDomain(), modelLocation.getResourcePath());
if(!cache.containsKey(file))
B3DModel model;
IResource resource = null;
try
{
IResource resource = null;
try
{
try
{
resource = manager.getResource(file);
}
catch(FileNotFoundException e)
{
if(modelLocation.getResourcePath().startsWith("models/block/"))
resource = manager.getResource(new ResourceLocation(file.getResourceDomain(), "models/item/" + file.getResourcePath().substring("models/block/".length())));
else if(modelLocation.getResourcePath().startsWith("models/item/"))
resource = manager.getResource(new ResourceLocation(file.getResourceDomain(), "models/block/" + file.getResourcePath().substring("models/item/".length())));
else throw e;
}
B3DModel.Parser parser = new B3DModel.Parser(resource.getInputStream());
B3DModel model = parser.parse();
cache.put(file, model);
resource = manager.getResource(file);
}
catch(IOException e)
catch(FileNotFoundException e)
{
cache.put(file, null);
throw e;
}
finally
{
IOUtils.closeQuietly(resource);
if(modelLocation.getResourcePath().startsWith("models/block/"))
resource = manager.getResource(new ResourceLocation(file.getResourceDomain(), "models/item/" + file.getResourcePath().substring("models/block/".length())));
else if(modelLocation.getResourcePath().startsWith("models/item/"))
resource = manager.getResource(new ResourceLocation(file.getResourceDomain(), "models/block/" + file.getResourcePath().substring("models/item/".length())));
else throw e;
}
B3DModel.Parser parser = new B3DModel.Parser(resource.getInputStream());
model = parser.parse();
}
catch(IOException e)
{
throw e;
}
finally
{
IOUtils.closeQuietly(resource);
}
B3DModel model = cache.get(file);
if(model == null) throw new ModelLoaderRegistry.LoaderException("Error loading model previously: " + file);
if(!(model.getRoot().getKind() instanceof Mesh))
{
@@ -46,8 +46,6 @@ public enum OBJLoader implements ICustomModelLoader {
private IResourceManager manager;
private final Set<String> enabledDomains = new HashSet<>();
private final Map<ResourceLocation, OBJModel> cache = new HashMap<>();
private final Map<ResourceLocation, Exception> errors = new HashMap<>();
public void addDomain(String domain)
{
@@ -59,8 +57,6 @@ public enum OBJLoader implements ICustomModelLoader {
public void onResourceManagerReload(IResourceManager resourceManager)
{
this.manager = resourceManager;
cache.clear();
errors.clear();
}
@Override
@@ -73,45 +69,36 @@ public enum OBJLoader implements ICustomModelLoader {
public IModel loadModel(ResourceLocation modelLocation) throws Exception
{
ResourceLocation file = new ResourceLocation(modelLocation.getResourceDomain(), modelLocation.getResourcePath());
if (!cache.containsKey(file))
IResource resource = null;
try
{
IResource resource = null;
try
{
try
{
resource = manager.getResource(file);
}
catch (FileNotFoundException e)
{
if (modelLocation.getResourcePath().startsWith("models/block/"))
resource = manager.getResource(new ResourceLocation(file.getResourceDomain(), "models/item/" + file.getResourcePath().substring("models/block/".length())));
else if (modelLocation.getResourcePath().startsWith("models/item/"))
resource = manager.getResource(new ResourceLocation(file.getResourceDomain(), "models/block/" + file.getResourcePath().substring("models/item/".length())));
else throw e;
}
OBJModel.Parser parser = new OBJModel.Parser(resource, manager);
OBJModel model = null;
try
{
model = parser.parse();
}
catch (Exception e)
{
errors.put(modelLocation, e);
}
finally
{
cache.put(modelLocation, model);
}
resource = manager.getResource(file);
}
finally
catch (FileNotFoundException e)
{
IOUtils.closeQuietly(resource);
if (modelLocation.getResourcePath().startsWith("models/block/"))
resource = manager.getResource(new ResourceLocation(file.getResourceDomain(), "models/item/" + file.getResourcePath().substring("models/block/".length())));
else if (modelLocation.getResourcePath().startsWith("models/item/"))
resource = manager.getResource(new ResourceLocation(file.getResourceDomain(), "models/block/" + file.getResourcePath().substring("models/item/".length())));
else throw e;
}
OBJModel.Parser parser = new OBJModel.Parser(resource, manager);
OBJModel model;
try
{
model = parser.parse();
}
catch (Exception e)
{
throw new ModelLoaderRegistry.LoaderException("Error loading model previously: " + file, e);
}
return model;
}
finally
{
IOUtils.closeQuietly(resource);
}
OBJModel model = cache.get(file);
if (model == null) throw new ModelLoaderRegistry.LoaderException("Error loading model previously: " + file, errors.get(modelLocation));
return model;
}
}
}