diff --git a/core/assets/sprites/fallback/sprites.atlas b/core/assets/sprites/fallback/sprites.atlas index d2bc1ff4ef..1eee5d2200 100644 --- a/core/assets/sprites/fallback/sprites.atlas +++ b/core/assets/sprites/fallback/sprites.atlas @@ -1,7 +1,7 @@ sprites.png size: 2048,2048 -format: RGBA8888 +format: rgba8888 filter: nearest,nearest repeat: none core-silo @@ -539,7 +539,7 @@ reaper-cell sprites2.png size: 2048,2048 -format: RGBA8888 +format: rgba8888 filter: nearest,nearest repeat: none data-processor @@ -5774,7 +5774,7 @@ beam-weapon sprites3.png size: 2048,1024 -format: RGBA8888 +format: rgba8888 filter: nearest,nearest repeat: none rubble-1-0 @@ -6060,7 +6060,7 @@ scorch-9-2 sprites4.png size: 2048,512 -format: RGBA8888 +format: rgba8888 filter: nearest,nearest repeat: none char1 @@ -7431,7 +7431,7 @@ water-edge sprites5.png size: 2048,1024 -format: RGBA8888 +format: rgba8888 filter: nearest,nearest repeat: none additive-reconstructor-icon-editor @@ -9544,7 +9544,7 @@ white-tree-icon-editor sprites6.png size: 2048,1024 -format: RGBA8888 +format: rgba8888 filter: nearest,nearest repeat: none alpha-bg diff --git a/core/assets/sprites/fallback/sprites3.png b/core/assets/sprites/fallback/sprites3.png index 962dbf3647..1b766809aa 100644 Binary files a/core/assets/sprites/fallback/sprites3.png and b/core/assets/sprites/fallback/sprites3.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 5887fb7413..95468e534f 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -1,7 +1,7 @@ sprites.png size: 4096,2048 -format: RGBA8888 +format: rgba8888 filter: nearest,nearest repeat: none core-silo @@ -5768,7 +5768,7 @@ beam-weapon sprites2.png size: 4096,512 -format: RGBA8888 +format: rgba8888 filter: nearest,nearest repeat: none rubble-1-0 @@ -6054,7 +6054,7 @@ scorch-9-2 sprites3.png size: 4096,256 -format: RGBA8888 +format: rgba8888 filter: nearest,nearest repeat: none char1 @@ -7425,7 +7425,7 @@ water-edge sprites4.png size: 4096,512 -format: RGBA8888 +format: rgba8888 filter: nearest,nearest repeat: none additive-reconstructor-icon-editor @@ -9538,7 +9538,7 @@ white-tree-icon-editor sprites5.png size: 4096,512 -format: RGBA8888 +format: rgba8888 filter: nearest,nearest repeat: none alpha-bg diff --git a/core/assets/sprites/sprites2.png b/core/assets/sprites/sprites2.png index 16e2484125..1a34438d80 100644 Binary files a/core/assets/sprites/sprites2.png and b/core/assets/sprites/sprites2.png differ diff --git a/core/src/mindustry/async/PhysicsProcess.java b/core/src/mindustry/async/PhysicsProcess.java index 20dcbcc0f6..46946fd3de 100644 --- a/core/src/mindustry/async/PhysicsProcess.java +++ b/core/src/mindustry/async/PhysicsProcess.java @@ -22,7 +22,7 @@ public class PhysicsProcess implements AsyncProcess{ public PhysicsProcess(){ def = new BodyDef(); - def.type = BodyType.DynamicBody; + def.type = BodyType.dynamicBody; //currently only enabled for units group = Groups.unit; diff --git a/core/src/mindustry/core/Renderer.java b/core/src/mindustry/core/Renderer.java index 6309f88dfa..cf0c911d52 100644 --- a/core/src/mindustry/core/Renderer.java +++ b/core/src/mindustry/core/Renderer.java @@ -339,7 +339,7 @@ public class Renderer implements ApplicationListener{ lines[i + 3] = (byte)255; } buffer.end(); - Pixmap fullPixmap = new Pixmap(w, h, Pixmap.Format.RGBA8888); + Pixmap fullPixmap = new Pixmap(w, h, Pixmap.Format.rgba8888); Buffers.copy(lines, 0, fullPixmap.getPixels(), lines.length); Fi file = screenshotDirectory.child("screenshot-" + Time.millis() + ".png"); PixmapIO.writePNG(file, fullPixmap); diff --git a/core/src/mindustry/editor/MapGenerateDialog.java b/core/src/mindustry/editor/MapGenerateDialog.java index f7ebe0eae6..1517a63db8 100644 --- a/core/src/mindustry/editor/MapGenerateDialog.java +++ b/core/src/mindustry/editor/MapGenerateDialog.java @@ -1,15 +1,14 @@ package mindustry.editor; import arc.*; -import arc.struct.*; import arc.func.*; import arc.graphics.*; -import arc.graphics.Pixmap.*; import arc.math.*; import arc.math.geom.*; import arc.scene.ui.*; import arc.scene.ui.ImageButton.*; import arc.scene.ui.layout.*; +import arc.struct.*; import arc.util.*; import arc.util.async.*; import mindustry.game.*; @@ -158,7 +157,7 @@ public class MapGenerateDialog extends BaseDialog{ texture = null; } - pixmap = new Pixmap(editor.width() / scaling, editor.height() / scaling, Format.RGBA8888); + pixmap = new Pixmap(editor.width() / scaling, editor.height() / scaling); texture = new Texture(pixmap); cont.clear(); diff --git a/core/src/mindustry/graphics/LoadRenderer.java b/core/src/mindustry/graphics/LoadRenderer.java index a805ab768b..afbab1b6e2 100644 --- a/core/src/mindustry/graphics/LoadRenderer.java +++ b/core/src/mindustry/graphics/LoadRenderer.java @@ -35,7 +35,7 @@ public class LoadRenderer implements Disposable{ private Mesh mesh = MeshBuilder.buildHex(colorRed, 2, true, 1f); private Camera3D cam = new Camera3D(); private int lastLength = -1; - private FxProcessor fx = new FxProcessor(Format.RGBA8888, 2, 2, false, true); + private FxProcessor fx = new FxProcessor(Format.rgba8888, 2, 2, false, true); private WindowedMean renderTimes = new WindowedMean(20); private long lastFrameTime; diff --git a/core/src/mindustry/graphics/MinimapRenderer.java b/core/src/mindustry/graphics/MinimapRenderer.java index 9506116187..b3d3dc2099 100644 --- a/core/src/mindustry/graphics/MinimapRenderer.java +++ b/core/src/mindustry/graphics/MinimapRenderer.java @@ -66,7 +66,7 @@ public class MinimapRenderer implements Disposable{ texture.dispose(); } setZoom(4f); - pixmap = new Pixmap(world.width(), world.height(), Format.RGBA8888); + pixmap = new Pixmap(world.width(), world.height(), Format.rgba8888); texture = new Texture(pixmap); region = new TextureRegion(texture); } diff --git a/core/src/mindustry/graphics/MultiPacker.java b/core/src/mindustry/graphics/MultiPacker.java index 40bce36694..ac8277b078 100644 --- a/core/src/mindustry/graphics/MultiPacker.java +++ b/core/src/mindustry/graphics/MultiPacker.java @@ -12,7 +12,7 @@ public class MultiPacker implements Disposable{ public MultiPacker(){ for(int i = 0; i < packers.length; i++){ int pageSize = 2048; - packers[i] = new PixmapPacker(pageSize, pageSize, Format.RGBA8888, 2, true); + packers[i] = new PixmapPacker(pageSize, pageSize, Format.rgba8888, 2, true); } } diff --git a/core/src/mindustry/io/MapIO.java b/core/src/mindustry/io/MapIO.java index b31151331a..f88ebf9a37 100644 --- a/core/src/mindustry/io/MapIO.java +++ b/core/src/mindustry/io/MapIO.java @@ -72,8 +72,8 @@ public class MapIO{ SaveVersion ver = SaveIO.getSaveWriter(version); ver.region("meta", stream, counter, ver::readStringMap); - Pixmap floors = new Pixmap(map.width, map.height, Format.RGBA8888); - Pixmap walls = new Pixmap(map.width, map.height, Format.RGBA8888); + Pixmap floors = new Pixmap(map.width, map.height); + Pixmap walls = new Pixmap(map.width, map.height); int black = 255; int shade = Color.rgba8888(0f, 0f, 0f, 0.5f); CachedTile tile = new CachedTile(){ @@ -137,7 +137,7 @@ public class MapIO{ } public static Pixmap generatePreview(Tiles tiles){ - Pixmap pixmap = new Pixmap(tiles.width, tiles.height, Format.RGBA8888); + Pixmap pixmap = new Pixmap(tiles.width, tiles.height, Format.rgba8888); for(int x = 0; x < pixmap.getWidth(); x++){ for(int y = 0; y < pixmap.getHeight(); y++){ Tile tile = tiles.getn(x, y); diff --git a/core/src/mindustry/ui/Fonts.java b/core/src/mindustry/ui/Fonts.java index 7a4d280d6a..40d3687fa6 100644 --- a/core/src/mindustry/ui/Fonts.java +++ b/core/src/mindustry/ui/Fonts.java @@ -110,7 +110,7 @@ public class Fonts{ /** Called from a static context for use in the loading screen.*/ public static void loadDefaultFont(){ - UI.packer = new PixmapPacker(2048, 2048, Format.RGBA8888, 2, true); + UI.packer = new PixmapPacker(2048, 2048, Format.rgba8888, 2, true); FileHandleResolver resolver = new InternalFileHandleResolver(); Core.assets.setLoader(FreeTypeFontGenerator.class, new FreeTypeFontGeneratorLoader(resolver)); Core.assets.setLoader(BitmapFont.class, null, new FreetypeFontLoader(resolver){ diff --git a/gradle.properties b/gradle.properties index e16617ee72..5cc5f35899 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=f3f3e00f8b13a7fd63286302a083a23163057465 +archash=23b2fc721fa7ebb52e2edb0ce72b87731050e76e