diff --git a/core/src/mindustry/core/Control.java b/core/src/mindustry/core/Control.java index 47241fc418..58ade85b5f 100644 --- a/core/src/mindustry/core/Control.java +++ b/core/src/mindustry/core/Control.java @@ -474,16 +474,6 @@ public class Control implements ApplicationListener, Loadable{ if(state.isGame()){ input.update(); - if(state.isCampaign()){ - for(Tilec tile : state.teams.cores(player.team())){ - for(Item item : content.items()){ - if(tile.items().has(item)){ - item.unlock(); - } - } - } - } - if(state.rules.tutorial){ tutorial.update(); } diff --git a/core/src/mindustry/graphics/BlockRenderer.java b/core/src/mindustry/graphics/BlockRenderer.java index 6218e9079d..5a6b8d5208 100644 --- a/core/src/mindustry/graphics/BlockRenderer.java +++ b/core/src/mindustry/graphics/BlockRenderer.java @@ -44,7 +44,7 @@ public class BlockRenderer implements Disposable{ shadowEvents.clear(); lastCamY = lastCamX = -99; //invalidate camera position so blocks get updated - shadows.getTexture().setFilter(TextureFilter.Linear, TextureFilter.Linear); + shadows.getTexture().setFilter(TextureFilter.linear, TextureFilter.linear); shadows.resize(world.width(), world.height()); shadows.begin(); Core.graphics.clear(Color.white); @@ -62,7 +62,7 @@ public class BlockRenderer implements Disposable{ Draw.color(); shadows.end(); - dark.getTexture().setFilter(TextureFilter.Linear, TextureFilter.Linear); + dark.getTexture().setFilter(TextureFilter.linear, TextureFilter.linear); dark.resize(world.width(), world.height()); dark.begin(); Core.graphics.clear(Color.white); diff --git a/core/src/mindustry/graphics/CubemapMesh.java b/core/src/mindustry/graphics/CubemapMesh.java index f9bfb4e15c..7631c2bd2d 100644 --- a/core/src/mindustry/graphics/CubemapMesh.java +++ b/core/src/mindustry/graphics/CubemapMesh.java @@ -59,7 +59,7 @@ public class CubemapMesh implements Disposable{ public CubemapMesh(Cubemap map){ this.map = map; - this.map.setFilter(TextureFilter.Linear); + this.map.setFilter(TextureFilter.linear); this.mesh = new Mesh(true, vertices.length, 0, new VertexAttribute(Usage.position, 3, "a_position") ); diff --git a/core/src/mindustry/graphics/Pixelator.java b/core/src/mindustry/graphics/Pixelator.java index b4093c9efa..4d77af56a7 100644 --- a/core/src/mindustry/graphics/Pixelator.java +++ b/core/src/mindustry/graphics/Pixelator.java @@ -15,7 +15,7 @@ public class Pixelator implements Disposable{ private float px, py, pre; { - buffer.getTexture().setFilter(TextureFilter.Nearest, TextureFilter.Nearest); + buffer.getTexture().setFilter(TextureFilter.nearest, TextureFilter.nearest); } public void drawPixelate(){ diff --git a/core/src/mindustry/graphics/Shaders.java b/core/src/mindustry/graphics/Shaders.java index cf4a827713..7823a5ee7a 100644 --- a/core/src/mindustry/graphics/Shaders.java +++ b/core/src/mindustry/graphics/Shaders.java @@ -203,8 +203,8 @@ public class Shaders{ super(frag, "screenspace"); Core.assets.load("sprites/noise.png", Texture.class).loaded = t -> { - ((Texture)t).setFilter(TextureFilter.Linear); - ((Texture)t).setWrap(TextureWrap.Repeat); + ((Texture)t).setFilter(TextureFilter.linear); + ((Texture)t).setWrap(TextureWrap.repeat); }; } diff --git a/core/src/mindustry/mod/Mods.java b/core/src/mindustry/mod/Mods.java index f034f03eb2..627836f414 100644 --- a/core/src/mindustry/mod/Mods.java +++ b/core/src/mindustry/mod/Mods.java @@ -165,7 +165,7 @@ public class Mods implements Loadable{ } } - TextureFilter filter = Core.settings.getBool("linear") ? TextureFilter.Linear : TextureFilter.Nearest; + TextureFilter filter = Core.settings.getBool("linear") ? TextureFilter.linear : TextureFilter.nearest; //flush so generators can use these sprites packer.flush(filter, Core.atlas); @@ -452,7 +452,7 @@ public class Mods implements Loadable{ content.init(); content.load(); content.loadColors(); - Core.atlas.getTextures().each(t -> t.setFilter(Core.settings.getBool("linear") ? TextureFilter.Linear : TextureFilter.Nearest)); + Core.atlas.getTextures().each(t -> t.setFilter(Core.settings.getBool("linear") ? TextureFilter.linear : TextureFilter.nearest)); requiresReload = false; loadIcons(); diff --git a/core/src/mindustry/ui/Fonts.java b/core/src/mindustry/ui/Fonts.java index 9ad71e4b3c..7a4d280d6a 100644 --- a/core/src/mindustry/ui/Fonts.java +++ b/core/src/mindustry/ui/Fonts.java @@ -127,8 +127,8 @@ public class Fonts{ scaled.add(parameter.fontParameters); } - parameter.fontParameters.magFilter = TextureFilter.Linear; - parameter.fontParameters.minFilter = TextureFilter.Linear; + parameter.fontParameters.magFilter = TextureFilter.linear; + parameter.fontParameters.minFilter = TextureFilter.linear; parameter.fontParameters.packer = UI.packer; return super.loadSync(manager, fileName, file, parameter); } @@ -175,7 +175,7 @@ public class Fonts{ atlas.disposePixmap(texture); page.setDirty(true); - page.updateTexture(TextureFilter.Linear, TextureFilter.Linear, false); + page.updateTexture(TextureFilter.linear, TextureFilter.linear, false); } public static TextureRegionDrawable getGlyph(BitmapFont font, char glyph){ diff --git a/core/src/mindustry/ui/dialogs/SchematicsDialog.java b/core/src/mindustry/ui/dialogs/SchematicsDialog.java index 345609653a..49114836b4 100644 --- a/core/src/mindustry/ui/dialogs/SchematicsDialog.java +++ b/core/src/mindustry/ui/dialogs/SchematicsDialog.java @@ -29,7 +29,7 @@ public class SchematicsDialog extends BaseDialog{ public SchematicsDialog(){ super("$schematics"); Core.assets.load("sprites/schematic-background.png", Texture.class).loaded = t -> { - ((Texture)t).setWrap(TextureWrap.Repeat); + ((Texture)t).setWrap(TextureWrap.repeat); }; shouldPause = true; diff --git a/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java index 969106c358..8b5e789a7b 100644 --- a/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java +++ b/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java @@ -338,7 +338,7 @@ public class SettingsMenuDialog extends SettingsDialog{ graphics.checkPref("animatedshields", !mobile); } if(!ios){ - graphics.checkPref("bloom", !mobile, val -> renderer.toggleBloom(val)); + graphics.checkPref("bloom", true, val -> renderer.toggleBloom(val)); }else{ Core.settings.put("bloom", false); } @@ -351,14 +351,14 @@ public class SettingsMenuDialog extends SettingsDialog{ graphics.checkPref("linear", true, b -> { for(Texture tex : Core.atlas.getTextures()){ - TextureFilter filter = b ? TextureFilter.Linear : TextureFilter.Nearest; + TextureFilter filter = b ? TextureFilter.linear : TextureFilter.nearest; tex.setFilter(filter, filter); } }); if(Core.settings.getBool("linear")){ for(Texture tex : Core.atlas.getTextures()){ - TextureFilter filter = TextureFilter.Linear; + TextureFilter filter = TextureFilter.linear; tex.setFilter(filter, filter); } }