Catching of schematic preview errors / Fixes #1886
This commit is contained in:
@@ -51,7 +51,9 @@ public class Schematics implements Loadable{
|
|||||||
private OptimizedByteArrayOutputStream out = new OptimizedByteArrayOutputStream(1024);
|
private OptimizedByteArrayOutputStream out = new OptimizedByteArrayOutputStream(1024);
|
||||||
private Array<Schematic> all = new Array<>();
|
private Array<Schematic> all = new Array<>();
|
||||||
private OrderedMap<Schematic, FrameBuffer> previews = new OrderedMap<>();
|
private OrderedMap<Schematic, FrameBuffer> previews = new OrderedMap<>();
|
||||||
|
private ObjectSet<Schematic> errored = new ObjectSet<>();
|
||||||
private FrameBuffer shadowBuffer;
|
private FrameBuffer shadowBuffer;
|
||||||
|
private Texture errorTexture;
|
||||||
private long lastClearTime;
|
private long lastClearTime;
|
||||||
|
|
||||||
public Schematics(){
|
public Schematics(){
|
||||||
@@ -59,6 +61,9 @@ public class Schematics implements Loadable{
|
|||||||
previews.each((schem, m) -> m.dispose());
|
previews.each((schem, m) -> m.dispose());
|
||||||
previews.clear();
|
previews.clear();
|
||||||
shadowBuffer.dispose();
|
shadowBuffer.dispose();
|
||||||
|
if(errorTexture != null){
|
||||||
|
errorTexture.dispose();
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
Events.on(ContentReloadEvent.class, event -> {
|
Events.on(ContentReloadEvent.class, event -> {
|
||||||
@@ -66,6 +71,12 @@ public class Schematics implements Loadable{
|
|||||||
previews.clear();
|
previews.clear();
|
||||||
load();
|
load();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
Events.on(ClientLoadEvent.class, event -> {
|
||||||
|
Pixmap pixmap = Core.atlas.getPixmap("error").crop();
|
||||||
|
errorTexture = new Texture(pixmap);
|
||||||
|
pixmap.dispose();
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -163,7 +174,15 @@ public class Schematics implements Loadable{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public Texture getPreview(Schematic schematic){
|
public Texture getPreview(Schematic schematic){
|
||||||
return getBuffer(schematic).getTexture();
|
if(errored.contains(schematic)) return errorTexture;
|
||||||
|
|
||||||
|
try{
|
||||||
|
return getBuffer(schematic).getTexture();
|
||||||
|
}catch(Throwable t){
|
||||||
|
Log.err(t);
|
||||||
|
errored.add(schematic);
|
||||||
|
return errorTexture;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean hasPreview(Schematic schematic){
|
public boolean hasPreview(Schematic schematic){
|
||||||
|
|||||||
Reference in New Issue
Block a user