Compare commits

..

2 Commits

Author SHA1 Message Date
Anuken
430538ea7e Possible fix for "unsupported combination of formats" error 2020-12-01 18:17:57 -05:00
Anuken
ee966d1198 Removed requirements for optional inputs of blocks 2020-12-01 18:02:20 -05:00
3 changed files with 15 additions and 1 deletions

View File

@@ -35,11 +35,18 @@ public class LoadRenderer implements Disposable{
private Mesh mesh = MeshBuilder.buildHex(colorRed, 2, true, 1f); private Mesh mesh = MeshBuilder.buildHex(colorRed, 2, true, 1f);
private Camera3D cam = new Camera3D(); private Camera3D cam = new Camera3D();
private int lastLength = -1; private int lastLength = -1;
private FxProcessor fx = new FxProcessor(Format.rgba8888, 2, 2, false, true); private FxProcessor fx;
private WindowedMean renderTimes = new WindowedMean(20); private WindowedMean renderTimes = new WindowedMean(20);
private long lastFrameTime; private long lastFrameTime;
{ {
//some systems don't support rgba8888 w/ a stencil buffer
try{
fx = new FxProcessor(Format.rgba8888, 2, 2, false, true);
}catch(Exception e){
fx = new FxProcessor(Format.rgb565, 2, 2, false, true);
}
//vignetting is probably too much //vignetting is probably too much
//fx.addEffect(new VignettingFilter(false)); //fx.addEffect(new VignettingFilter(false));
fx.addEffect(new BloomFilter()); fx.addEffect(new BloomFilter());

View File

@@ -634,6 +634,8 @@ public class Block extends UnlockableContent{
//also requires inputs //also requires inputs
consumes.each(c -> { consumes.each(c -> {
if(c.isOptional()) return;
if(c instanceof ConsumeItems i){ if(c instanceof ConsumeItems i){
for(ItemStack stack : i.items){ for(ItemStack stack : i.items){
cons.get(stack.item); cons.get(stack.item);

View File

@@ -0,0 +1,5 @@
[This is a truncated changelog, see Github for full notes]
- Fixed two rare crashes
- Made units depend on their production materials in tech tree
- Made conveyors replaceable by distributors
- Translation updates