diff --git a/.gitignore b/.gitignore index 543197c2f8..c469d6919f 100644 --- a/.gitignore +++ b/.gitignore @@ -19,7 +19,6 @@ logs/ /annotations/out/ /net/build/ /tools/build/ -/core/build/ /tests/build/ /server/build/ changelog @@ -143,13 +142,6 @@ nb-configuration.xml /local.properties .gradle/ gradle-app.setting -/build/ -/android/build/ -/core/build/ -/desktop/build/ -/html/build/ -/ios/build/ -/ios-moe/build/ ## OS Specific .DS_Store diff --git a/annotations/build.gradle b/annotations/build.gradle index 4ee43cfcb3..4532472197 100644 --- a/annotations/build.gradle +++ b/annotations/build.gradle @@ -1,2 +1,2 @@ sourceSets.main.java.srcDirs = ["src/main/java/"] -sourceSets.main.resources.srcDirs = ["src/main/resources/"] \ No newline at end of file +sourceSets.main.resources.srcDirs = ["src/main/resources/"] diff --git a/annotations/src/main/java/mindustry/annotations/BaseProcessor.java b/annotations/src/main/java/mindustry/annotations/BaseProcessor.java index 3cf9ac44b0..ac87f5666d 100644 --- a/annotations/src/main/java/mindustry/annotations/BaseProcessor.java +++ b/annotations/src/main/java/mindustry/annotations/BaseProcessor.java @@ -115,12 +115,12 @@ public abstract class BaseProcessor extends AbstractProcessor{ return ClassName.get(c).box(); } - public static TypeVariableName getTVN(TypeParameterElement element) { + public static TypeVariableName getTVN(TypeParameterElement element){ String name = element.getSimpleName().toString(); List boundsMirrors = element.getBounds(); List boundsTypeNames = new ArrayList<>(); - for (TypeMirror typeMirror : boundsMirrors) { + for (TypeMirror typeMirror : boundsMirrors){ boundsTypeNames.add(TypeName.get(typeMirror)); } @@ -137,11 +137,11 @@ public abstract class BaseProcessor extends AbstractProcessor{ if(imports != null){ String rawSource = file.toString(); Seq result = new Seq<>(); - for (String s : rawSource.split("\n", -1)) { + for(String s : rawSource.split("\n", -1)){ result.add(s); - if (s.startsWith("package ")) { + if (s.startsWith("package ")){ result.add(""); - for (String i : imports) { + for (String i : imports){ result.add(i); } } diff --git a/core/assets-raw/fontgen/config.json b/core/assets-raw/fontgen/config.json index 1c25eac26c..2c3fe69cc8 100644 --- a/core/assets-raw/fontgen/config.json +++ b/core/assets-raw/fontgen/config.json @@ -935,4 +935,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/core/assets/bloomshaders/alpha_bloom.frag b/core/assets/bloomshaders/alpha_bloom.frag index a48233ded0..b3475ff259 100644 --- a/core/assets/bloomshaders/alpha_bloom.frag +++ b/core/assets/bloomshaders/alpha_bloom.frag @@ -10,4 +10,4 @@ void main(){ vec4 bloom = texture2D(u_texture1, v_texCoords) * BloomIntensity; original = original * (vec4(1.0) - bloom); gl_FragColor = original + bloom; -} \ No newline at end of file +} diff --git a/core/assets/bloomshaders/alpha_threshold.frag b/core/assets/bloomshaders/alpha_threshold.frag index b2ffe580a6..fc910bed6c 100644 --- a/core/assets/bloomshaders/alpha_threshold.frag +++ b/core/assets/bloomshaders/alpha_threshold.frag @@ -11,4 +11,4 @@ void main(){ gl_FragColor = vec4(0.0); } //gl_FragColor = (texture2D(u_texture0, v_texCoords) - vec4(threshold.r)) * threshold.g; -} \ No newline at end of file +} diff --git a/core/assets/bloomshaders/bloom.frag b/core/assets/bloomshaders/bloom.frag index 65abbe56d1..e6bac1f0bf 100644 --- a/core/assets/bloomshaders/bloom.frag +++ b/core/assets/bloomshaders/bloom.frag @@ -10,4 +10,4 @@ void main(){ vec4 bloom = texture2D(u_texture1, v_texCoords) * BloomIntensity; original = original * (vec4(1.0) - bloom); gl_FragColor = original + bloom; -} \ No newline at end of file +} diff --git a/core/assets/bloomshaders/blurspace.vert b/core/assets/bloomshaders/blurspace.vert index bc16d0b2a7..e766d21cee 100644 --- a/core/assets/bloomshaders/blurspace.vert +++ b/core/assets/bloomshaders/blurspace.vert @@ -23,4 +23,4 @@ void main(){ v_texCoords4 = a_texCoord0 + f; gl_Position = a_position; -} \ No newline at end of file +} diff --git a/core/assets/bloomshaders/maskedtreshold.frag b/core/assets/bloomshaders/maskedtreshold.frag index ec09b4435a..ec2634ef3f 100644 --- a/core/assets/bloomshaders/maskedtreshold.frag +++ b/core/assets/bloomshaders/maskedtreshold.frag @@ -6,4 +6,4 @@ void main(){ vec4 tex = texture2D(u_texture0, v_texCoords); vec3 colors = (tex.rgb - threshold.r) * threshold.g * tex.a; gl_FragColor = vec4(colors, tex.a); -} \ No newline at end of file +} diff --git a/core/assets/bloomshaders/screenspace.vert b/core/assets/bloomshaders/screenspace.vert index 1c57ff8852..af368efbb4 100644 --- a/core/assets/bloomshaders/screenspace.vert +++ b/core/assets/bloomshaders/screenspace.vert @@ -5,4 +5,4 @@ varying vec2 v_texCoords; void main(){ v_texCoords = a_texCoord0; gl_Position = a_position; -} \ No newline at end of file +} diff --git a/core/assets/bloomshaders/threshold.frag b/core/assets/bloomshaders/threshold.frag index 932bf77c5d..705d6987d5 100644 --- a/core/assets/bloomshaders/threshold.frag +++ b/core/assets/bloomshaders/threshold.frag @@ -4,4 +4,4 @@ varying mediump vec2 v_texCoords; void main(){ gl_FragColor.rgb = (texture2D(u_texture0, v_texCoords).rgb - vec3(threshold.x)) * threshold.y; -} \ No newline at end of file +} diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index a59e2fff42..cd4e6b3463 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -1342,4 +1342,4 @@ block.cyclone.description = A large anti-air and anti-ground turret. Fires explo block.spectre.description = A massive dual-barreled cannon. Shoots large armor-piercing bullets at air and ground targets. block.meltdown.description = A massive laser cannon. Charges and fires a persistent laser beam at nearby enemies. Requires coolant to operate. block.repair-point.description = Continuously heals the closest damaged unit in its vicinity. -block.segment.description = Damages and destroys incoming projectiles. Laser projectiles are not targeted. \ No newline at end of file +block.segment.description = Damages and destroys incoming projectiles. Laser projectiles are not targeted. diff --git a/core/assets/shaders/atmosphere.frag b/core/assets/shaders/atmosphere.frag index cbb7c4ea21..f5f437f298 100644 --- a/core/assets/shaders/atmosphere.frag +++ b/core/assets/shaders/atmosphere.frag @@ -27,12 +27,12 @@ uniform vec3 u_rcampos; uniform mat4 u_invproj; uniform vec3 u_light; -vec2 rayIntersection(vec3 p, vec3 dir, float radius) { +vec2 rayIntersection(vec3 p, vec3 dir, float radius){ float b = dot(p, dir); float c = dot(p, p) - radius * radius; float d = b * b - c; - if (d < 0.0) { + if(d < 0.0){ return vec2(MAX, -MAX); } d = sqrt(d); @@ -43,7 +43,7 @@ vec2 rayIntersection(vec3 p, vec3 dir, float radius) { return vec2(near, far); } -float miePhase(float g, float c, float cc) { +float miePhase(float g, float c, float cc){ float gg = g * g; float a = (1.0 - gg) * (1.0 + cc); @@ -55,20 +55,20 @@ float miePhase(float g, float c, float cc) { return 1.5 * a / b; } -float rayleighPhase(float cc) { +float rayleighPhase(float cc){ return 0.75 * (1.0 + cc); } -float density(vec3 p) { +float density(vec3 p){ return exp(-(length(p) - u_innerRadius) * (4.0 / (u_outerRadius - u_innerRadius))); } -float optic(vec3 p, vec3 q) { +float optic(vec3 p, vec3 q){ vec3 step = (q - p) / fNumOutScatter; vec3 v = p + step * 0.5; float sum = 0.0; - for (int i = 0; i < numOutScatter; i++) { + for(int i = 0; i < numOutScatter; i++){ sum += density(v); v += step; } @@ -76,7 +76,7 @@ float optic(vec3 p, vec3 q) { return sum; } -vec3 inScatter(vec3 o, vec3 dir, vec2 e, vec3 l) { +vec3 inScatter(vec3 o, vec3 dir, vec2 e, vec3 l){ float len = (e.y - e.x) / fNumInScatter; vec3 step = dir * len; vec3 p = o + dir * e.x; @@ -115,4 +115,4 @@ void main(){ vec3 result = inScatter(eye, dir, e, l); gl_FragColor = vec4(result, 1.0); -} \ No newline at end of file +} diff --git a/core/assets/shaders/atmosphere.vert b/core/assets/shaders/atmosphere.vert index 6899e0f0f4..05081108d0 100644 --- a/core/assets/shaders/atmosphere.vert +++ b/core/assets/shaders/atmosphere.vert @@ -10,4 +10,4 @@ void main(){ v_position = a_position; v_model = u_model; gl_Position = u_projection*u_model*a_position; -} \ No newline at end of file +} diff --git a/core/assets/shaders/blockbuild.frag b/core/assets/shaders/blockbuild.frag index c2fb1b4044..0c8f301350 100644 --- a/core/assets/shaders/blockbuild.frag +++ b/core/assets/shaders/blockbuild.frag @@ -24,7 +24,7 @@ bool cont(vec2 T, vec2 v){ id(T + vec2(step, 0) * v, base) || id(T + vec2(-step, 0) * v, base)); } -void main() { +void main(){ vec2 t = v_texCoords.xy; diff --git a/core/assets/shaders/cubemap.frag b/core/assets/shaders/cubemap.frag index 3f9a760e94..d6567508e9 100644 --- a/core/assets/shaders/cubemap.frag +++ b/core/assets/shaders/cubemap.frag @@ -5,4 +5,4 @@ uniform samplerCube u_cubemap; void main(){ gl_FragColor = textureCube(u_cubemap, v_texCoords); -} \ No newline at end of file +} diff --git a/core/assets/shaders/cubemap.vert b/core/assets/shaders/cubemap.vert index 546cec8f46..1d5d04f518 100644 --- a/core/assets/shaders/cubemap.vert +++ b/core/assets/shaders/cubemap.vert @@ -9,4 +9,4 @@ const float SCALE = 50.0; void main(){ v_texCoords = a_position; gl_Position = u_proj * vec4(a_position * SCALE, 1.0); -} \ No newline at end of file +} diff --git a/core/assets/shaders/default.frag b/core/assets/shaders/default.frag index 93be3cffc9..1f67c593ea 100644 --- a/core/assets/shaders/default.frag +++ b/core/assets/shaders/default.frag @@ -6,4 +6,4 @@ uniform sampler2D u_texture; void main(){ vec4 c = texture2D(u_texture, v_texCoords); gl_FragColor = v_color * mix(c, vec4(v_mix_color.rgb, c.a), v_mix_color.a); -} \ No newline at end of file +} diff --git a/core/assets/shaders/planetgrid.vert b/core/assets/shaders/planetgrid.vert index 5dd54ffebc..9eca283160 100644 --- a/core/assets/shaders/planetgrid.vert +++ b/core/assets/shaders/planetgrid.vert @@ -7,7 +7,7 @@ uniform mat4 u_trans; varying vec4 v_col; varying vec4 v_position; -void main() { +void main(){ gl_Position = u_proj * u_trans * a_position; v_col = a_color; v_position = a_position; diff --git a/core/assets/shaders/slag.frag b/core/assets/shaders/slag.frag index f904d48dbf..c038baf292 100755 --- a/core/assets/shaders/slag.frag +++ b/core/assets/shaders/slag.frag @@ -29,4 +29,4 @@ void main(){ } gl_FragColor = color; -} \ No newline at end of file +} diff --git a/core/assets/shaders/space.frag b/core/assets/shaders/space.frag index 3d669cabb7..73045aa54b 100755 --- a/core/assets/shaders/space.frag +++ b/core/assets/shaders/space.frag @@ -20,4 +20,4 @@ void main(){ color.rgb = texture2D(u_stars, coords/NSCALE + vec2(-0.1, -0.1) + u_ccampos / CAMSCALE).rgb; gl_FragColor = color; -} \ No newline at end of file +} diff --git a/core/assets/shaders/tar.frag b/core/assets/shaders/tar.frag index ea2a3b3f1d..228eb15718 100644 --- a/core/assets/shaders/tar.frag +++ b/core/assets/shaders/tar.frag @@ -24,4 +24,4 @@ void main(){ } gl_FragColor = color; -} \ No newline at end of file +} diff --git a/core/assets/shaders/unitbuild.frag b/core/assets/shaders/unitbuild.frag index 147b27106f..d4657060da 100644 --- a/core/assets/shaders/unitbuild.frag +++ b/core/assets/shaders/unitbuild.frag @@ -30,7 +30,7 @@ bool cont(vec2 T, vec2 v){ id(T + vec2(step, -step) * v, base) || id(T + vec2(-step, step) * v, base)); } -void main() { +void main(){ vec2 coords = (v_texCoords.xy - u_uv) / (u_uv2 - u_uv); vec2 t = v_texCoords.xy; vec2 v = vec2(1.0/u_texsize.x, 1.0/u_texsize.y); diff --git a/core/assets/shaders/water.frag b/core/assets/shaders/water.frag index f0c41ccd24..e7f4ee1016 100644 --- a/core/assets/shaders/water.frag +++ b/core/assets/shaders/water.frag @@ -34,4 +34,4 @@ void main(){ } gl_FragColor = vec4(color.rgb, 1.0); -} \ No newline at end of file +} diff --git a/core/src/mindustry/entities/Effect.java b/core/src/mindustry/entities/Effect.java index 3295a1ae00..4b7d642368 100644 --- a/core/src/mindustry/entities/Effect.java +++ b/core/src/mindustry/entities/Effect.java @@ -209,4 +209,4 @@ public class Effect{ } } -} \ No newline at end of file +} diff --git a/core/src/mindustry/entities/bullet/BulletType.java b/core/src/mindustry/entities/bullet/BulletType.java index 9b2cb9af02..0611b28f9a 100644 --- a/core/src/mindustry/entities/bullet/BulletType.java +++ b/core/src/mindustry/entities/bullet/BulletType.java @@ -160,7 +160,7 @@ public abstract class BulletType extends Content{ } public void hitTile(Bullet b, Building tile, float initialHealth){ - if(makeFire) { + if(makeFire){ Fires.create(tile.tile); } hit(b); @@ -249,7 +249,7 @@ public abstract class BulletType extends Content{ } public void init(Bullet b){ - if(pierceCap >= 1) { + if(pierceCap >= 1){ pierce = true; //pierceBuilding is not enabled by default, because a bullet may want to *not* pierce buildings } diff --git a/core/src/mindustry/entities/comp/BulletComp.java b/core/src/mindustry/entities/comp/BulletComp.java index 5a08710762..bec11c2711 100644 --- a/core/src/mindustry/entities/comp/BulletComp.java +++ b/core/src/mindustry/entities/comp/BulletComp.java @@ -142,7 +142,7 @@ abstract class BulletComp implements Timedc, Damagec, Hitboxc, Teamc, Posc, Draw }); } - if(type.pierceCap != -1 && collided.size >= type.pierceCap) { + if(type.pierceCap != -1 && collided.size >= type.pierceCap){ remove(); } } diff --git a/core/src/mindustry/entities/comp/LaunchCoreComp.java b/core/src/mindustry/entities/comp/LaunchCoreComp.java index 7283a9e220..4f642c8493 100644 --- a/core/src/mindustry/entities/comp/LaunchCoreComp.java +++ b/core/src/mindustry/entities/comp/LaunchCoreComp.java @@ -73,4 +73,4 @@ abstract class LaunchCoreComp implements Drawc, Timedc{ Fx.rocketSmokeLarge.at(cx() + Mathf.range(r), cy() + Mathf.range(r), fin()); } } -} \ No newline at end of file +} diff --git a/core/src/mindustry/graphics/InverseKinematics.java b/core/src/mindustry/graphics/InverseKinematics.java index a920dc6527..133eae78ff 100644 --- a/core/src/mindustry/graphics/InverseKinematics.java +++ b/core/src/mindustry/graphics/InverseKinematics.java @@ -26,4 +26,4 @@ public class InverseKinematics{ return dist > 0 && dist < lengthA; } -} \ No newline at end of file +} diff --git a/core/src/mindustry/graphics/LightRenderer.java b/core/src/mindustry/graphics/LightRenderer.java index 0a05c7409b..ebf1cf9187 100644 --- a/core/src/mindustry/graphics/LightRenderer.java +++ b/core/src/mindustry/graphics/LightRenderer.java @@ -198,4 +198,4 @@ public class LightRenderer{ lights.clear(); } -} \ No newline at end of file +} diff --git a/core/src/mindustry/graphics/LoadRenderer.java b/core/src/mindustry/graphics/LoadRenderer.java index 35674837d6..906460dabe 100644 --- a/core/src/mindustry/graphics/LoadRenderer.java +++ b/core/src/mindustry/graphics/LoadRenderer.java @@ -48,7 +48,7 @@ public class LoadRenderer implements Disposable{ new Bar("s_proc#", OS.cores / 16f, OS.cores < 4), new Bar("c_aprog", () -> assets != null, () -> assets.getProgress(), () -> false), new Bar("g_vtype", graphics.getGLVersion().type == Type.GLES ? 0.5f : 1f, graphics.getGLVersion().type == Type.GLES), - new Bar("s_mem#", () -> true, () -> Core.app.getJavaHeap() / 1024f / 1024f / 200f, () -> Core.app.getJavaHeap() > 1024*1024*110), + new Bar("s_mem#", () -> true, () -> Core.app.getJavaHeap() / 1024f / 1024f / 200f, () -> Core.app.getJavaHeap() > 1024 * 1024 * 110), new Bar("v_ver#", () -> Version.build != 0, () -> Version.build == -1 ? 0.3f : (Version.build - 103f) / 10f, () -> !Version.modifier.equals("release")), new Bar("s_osv", OS.isWindows ? 0.35f : OS.isLinux ? 0.9f : OS.isMac ? 0.5f : 0.2f, OS.isMac), new Bar("v_worlds#", () -> Vars.control != null && Vars.control.saves != null, () -> Vars.control.saves.getSaveSlots().size / 30f, () -> Vars.control.saves.getSaveSlots().size > 30), diff --git a/core/src/mindustry/logic/DataType.java b/core/src/mindustry/logic/DataType.java index 49090d69f6..d216313ce0 100644 --- a/core/src/mindustry/logic/DataType.java +++ b/core/src/mindustry/logic/DataType.java @@ -21,4 +21,4 @@ public enum DataType{ DataType(Color color){ this.color = color; } -} \ No newline at end of file +} diff --git a/core/src/mindustry/logic/LCategory.java b/core/src/mindustry/logic/LCategory.java index 849e2f64bd..dcdd0483fe 100644 --- a/core/src/mindustry/logic/LCategory.java +++ b/core/src/mindustry/logic/LCategory.java @@ -15,4 +15,4 @@ public enum LCategory{ LCategory(Color color){ this.color = color; } -} \ No newline at end of file +} diff --git a/core/src/mindustry/ui/dialogs/DatabaseDialog.java b/core/src/mindustry/ui/dialogs/DatabaseDialog.java index 1a718e318a..3b78fd80f1 100644 --- a/core/src/mindustry/ui/dialogs/DatabaseDialog.java +++ b/core/src/mindustry/ui/dialogs/DatabaseDialog.java @@ -57,7 +57,7 @@ public class DatabaseDialog extends BaseDialog{ UnlockableContent unlock = (UnlockableContent)array.get(i); Image image = unlocked(unlock) ? new Image(unlock.icon(Cicon.medium)).setScaling(Scaling.fit) : new Image(Icon.lock, Pal.gray); - list.add(image).size(8*4).pad(3); + list.add(image).size(8 * 4).pad(3); ClickListener listener = new ClickListener(); image.addListener(listener); if(!Vars.mobile && unlocked(unlock)){ diff --git a/core/src/mindustry/ui/dialogs/JoinDialog.java b/core/src/mindustry/ui/dialogs/JoinDialog.java index aa4d9c22c8..0b046ff3c0 100644 --- a/core/src/mindustry/ui/dialogs/JoinDialog.java +++ b/core/src/mindustry/ui/dialogs/JoinDialog.java @@ -491,4 +491,4 @@ public class JoinDialog extends BaseDialog{ public Server(){ } } -} \ No newline at end of file +} diff --git a/core/src/mindustry/ui/dialogs/PlanetDialog.java b/core/src/mindustry/ui/dialogs/PlanetDialog.java index 07c3875140..a0536d87f4 100644 --- a/core/src/mindustry/ui/dialogs/PlanetDialog.java +++ b/core/src/mindustry/ui/dialogs/PlanetDialog.java @@ -271,7 +271,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ //planet selection new Table(t -> { t.right(); - if(content.planets().count(p -> p.accessible) > 1) { + if(content.planets().count(p -> p.accessible) > 1){ t.table(Styles.black6, pt -> { //TODO localize pt.add("[accent]Planets[]"); diff --git a/core/src/mindustry/ui/fragments/PlacementFragment.java b/core/src/mindustry/ui/fragments/PlacementFragment.java index 5aee062508..4c268e5dcd 100644 --- a/core/src/mindustry/ui/fragments/PlacementFragment.java +++ b/core/src/mindustry/ui/fragments/PlacementFragment.java @@ -122,7 +122,7 @@ public class PlacementFragment extends Fragment{ for(int i = 0; i < blockSelect.length; i++){ if(Core.input.keyTap(blockSelect[i])){ - if(i > 9) { //select block directionally + if(i > 9){ //select block directionally Seq blocks = getUnlockedByCategory(currentCategory); Block currentBlock = getSelectedBlock(currentCategory); for(int j = 0; j < blocks.size; j++){ diff --git a/core/src/mindustry/world/blocks/defense/turrets/TractorBeamTurret.java b/core/src/mindustry/world/blocks/defense/turrets/TractorBeamTurret.java index debe26f7e6..e51efec33a 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/TractorBeamTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/TractorBeamTurret.java @@ -110,7 +110,7 @@ public class TractorBeamTurret extends BaseTurret{ } @Override - public float efficiency() { + public float efficiency(){ return super.efficiency() * coolant; } diff --git a/core/src/mindustry/world/blocks/distribution/ArmoredConveyor.java b/core/src/mindustry/world/blocks/distribution/ArmoredConveyor.java index cba1366147..496f140e53 100644 --- a/core/src/mindustry/world/blocks/distribution/ArmoredConveyor.java +++ b/core/src/mindustry/world/blocks/distribution/ArmoredConveyor.java @@ -11,7 +11,7 @@ public class ArmoredConveyor extends Conveyor{ } @Override - public boolean blends(Tile tile, int rotation, int otherx, int othery, int otherrot, Block otherblock) { + public boolean blends(Tile tile, int rotation, int otherx, int othery, int otherrot, Block otherblock){ return otherblock.outputsItems() && blendsArmored(tile, rotation, otherx, othery, otherrot, otherblock); } diff --git a/core/src/mindustry/world/blocks/distribution/Conveyor.java b/core/src/mindustry/world/blocks/distribution/Conveyor.java index b7d973cfe7..e4d2baa25c 100644 --- a/core/src/mindustry/world/blocks/distribution/Conveyor.java +++ b/core/src/mindustry/world/blocks/distribution/Conveyor.java @@ -254,7 +254,7 @@ public class Conveyor extends Block implements Autotiler{ noSleep(); } - public boolean pass(Item item) { + public boolean pass(Item item){ if(next != null && next.team == team && next.acceptItem(this, item)){ next.handleItem(this, item); return true; diff --git a/core/src/mindustry/world/blocks/logic/LogicBlock.java b/core/src/mindustry/world/blocks/logic/LogicBlock.java index 8ccc558299..4b8367d75e 100644 --- a/core/src/mindustry/world/blocks/logic/LogicBlock.java +++ b/core/src/mindustry/world/blocks/logic/LogicBlock.java @@ -433,7 +433,7 @@ public class LogicBlock extends Block{ } @Override - public void drawSelect() { + public void drawSelect(){ Groups.unit.each(u -> u.controller() instanceof LogicAI ai && ai.controller == this, unit -> { Drawf.square(unit.x, unit.y, unit.hitSize, unit.rotation + 45); }); diff --git a/core/src/mindustry/world/blocks/power/PowerDiode.java b/core/src/mindustry/world/blocks/power/PowerDiode.java index e93dde18e9..75f589eabd 100644 --- a/core/src/mindustry/world/blocks/power/PowerDiode.java +++ b/core/src/mindustry/world/blocks/power/PowerDiode.java @@ -65,7 +65,7 @@ public class PowerDiode extends Block{ float frontStored = frontGraph.getBatteryStored() / frontGraph.getTotalBatteryCapacity(); // try to send if the back side has more % capacity stored than the front side - if(backStored > frontStored) { + if(backStored > frontStored){ // send half of the difference float amount = backGraph.getBatteryStored() * (backStored - frontStored) / 2; // prevent sending more than the front can handle diff --git a/core/src/mindustry/world/blocks/production/Pump.java b/core/src/mindustry/world/blocks/production/Pump.java index c4a6313129..4ed9b7c8d1 100644 --- a/core/src/mindustry/world/blocks/production/Pump.java +++ b/core/src/mindustry/world/blocks/production/Pump.java @@ -30,7 +30,7 @@ public class Pump extends LiquidBlock{ } @Override - public void drawPlace(int x, int y, int rotation, boolean valid) { + public void drawPlace(int x, int y, int rotation, boolean valid){ Tile tile = world.tile(x, y); if(tile == null) return; diff --git a/core/src/mindustry/world/blocks/units/CommandCenter.java b/core/src/mindustry/world/blocks/units/CommandCenter.java index a8ffa3c3e9..659db5e1d3 100644 --- a/core/src/mindustry/world/blocks/units/CommandCenter.java +++ b/core/src/mindustry/world/blocks/units/CommandCenter.java @@ -94,4 +94,4 @@ public class CommandCenter extends Block{ team.data().command = UnitCommand.all[read.b()]; } } -} \ No newline at end of file +} diff --git a/core/src/mindustry/world/blocks/units/Reconstructor.java b/core/src/mindustry/world/blocks/units/Reconstructor.java index 9374e0d801..fb7b4ea1de 100644 --- a/core/src/mindustry/world/blocks/units/Reconstructor.java +++ b/core/src/mindustry/world/blocks/units/Reconstructor.java @@ -67,7 +67,7 @@ public class Reconstructor extends UnitBlock{ stats.add(Stat.output, table -> { table.row(); for(var upgrade : upgrades){ - float size = 8*3; + float size = 8 * 3; if(upgrade[0].unlockedNow() && upgrade[1].unlockedNow()){ table.image(upgrade[0].icon(Cicon.small)).size(size).padRight(4).padLeft(10).scaling(Scaling.fit).right(); table.add(upgrade[0].localizedName).left(); diff --git a/core/src/mindustry/world/draw/DrawAnimation.java b/core/src/mindustry/world/draw/DrawAnimation.java index 1bb9d92982..6c4de1ef36 100644 --- a/core/src/mindustry/world/draw/DrawAnimation.java +++ b/core/src/mindustry/world/draw/DrawAnimation.java @@ -43,4 +43,4 @@ public class DrawAnimation extends DrawBlock{ public TextureRegion[] icons(Block block){ return new TextureRegion[]{block.region, top}; } -} \ No newline at end of file +} diff --git a/fastlane/metadata/android/hi-IN/full_description.txt b/fastlane/metadata/android/hi-IN/full_description.txt index 5f41ca22c8..acdb71229f 100644 --- a/fastlane/metadata/android/hi-IN/full_description.txt +++ b/fastlane/metadata/android/hi-IN/full_description.txt @@ -12,4 +12,4 @@ - स्थानीय नेटवर्क या समर्पित सर्वरस के माध्यम से क्रॉस-प्लेटफॉर्म मल्टीप्लेयर - कस्टम खेल के नियम: ब्लॉक की लागत, दुश्मन के आँकड़े, शुरू आइटम, लहर समय और अधिक बदलें - एक शक्तिशाली संपादक, यादृच्छिक रूप से अयस्कों, इलाकों, सजावट को बनाने और मानचित्रों के लिए समरूपता को लागू करने के लिए उपकरण के साथ -- अनुकूलन योग्य मानचित्र तरंग लेआउट \ No newline at end of file +- अनुकूलन योग्य मानचित्र तरंग लेआउट diff --git a/fastlane/metadata/android/hi-IN/short_description.txt b/fastlane/metadata/android/hi-IN/short_description.txt index 5a7eaf7783..8d38239525 100644 --- a/fastlane/metadata/android/hi-IN/short_description.txt +++ b/fastlane/metadata/android/hi-IN/short_description.txt @@ -1 +1 @@ -एक कारखाने आधारित सैंडबॉक्स टॉवर रक्षा खेल। \ No newline at end of file +एक कारखाने आधारित सैंडबॉक्स टॉवर रक्षा खेल। diff --git a/fastlane/metadata/android/hi-IN/summary.txt b/fastlane/metadata/android/hi-IN/summary.txt index 5a7eaf7783..8d38239525 100644 --- a/fastlane/metadata/android/hi-IN/summary.txt +++ b/fastlane/metadata/android/hi-IN/summary.txt @@ -1 +1 @@ -एक कारखाने आधारित सैंडबॉक्स टॉवर रक्षा खेल। \ No newline at end of file +एक कारखाने आधारित सैंडबॉक्स टॉवर रक्षा खेल। diff --git a/fastlane/metadata/android/hi-IN/title.txt b/fastlane/metadata/android/hi-IN/title.txt index 36df84b3d7..37ffbf60b2 100644 --- a/fastlane/metadata/android/hi-IN/title.txt +++ b/fastlane/metadata/android/hi-IN/title.txt @@ -1 +1 @@ -मिन्दुस्त्र्यि (Mindustry) \ No newline at end of file +मिन्दुस्त्र्यि (Mindustry) diff --git a/fastlane/metadata/android/in/full_description.txt b/fastlane/metadata/android/in/full_description.txt index 2597618097..cd5adae89b 100644 --- a/fastlane/metadata/android/in/full_description.txt +++ b/fastlane/metadata/android/in/full_description.txt @@ -11,4 +11,4 @@ Fitur: - Multipemain lintas platform melalui jaringan lokal atau server khusus - Aturan permainan khusus: Ubah biaya blok, statistik musuh, item awal, waktu gelombang, dan lainnya - Editor yang andal, dengan alat untuk menghasilkan sumber daya, medan, dekorasi, dan menerapkan simetri ke peta secara acak -- Tata letak gelombang peta yang dapat disesuaikan \ No newline at end of file +- Tata letak gelombang peta yang dapat disesuaikan diff --git a/fastlane/metadata/android/in/short_description.txt b/fastlane/metadata/android/in/short_description.txt index 2d6a63c557..19ec900c68 100644 --- a/fastlane/metadata/android/in/short_description.txt +++ b/fastlane/metadata/android/in/short_description.txt @@ -1 +1 @@ -Sebuah game pertahanan menara sandbox berbasis pabrik. \ No newline at end of file +Sebuah game pertahanan menara sandbox berbasis pabrik. diff --git a/fastlane/metadata/android/in/summary.txt b/fastlane/metadata/android/in/summary.txt index 2d6a63c557..19ec900c68 100644 --- a/fastlane/metadata/android/in/summary.txt +++ b/fastlane/metadata/android/in/summary.txt @@ -1 +1 @@ -Sebuah game pertahanan menara sandbox berbasis pabrik. \ No newline at end of file +Sebuah game pertahanan menara sandbox berbasis pabrik. diff --git a/fastlane/metadata/android/in/title.txt b/fastlane/metadata/android/in/title.txt index 2beb939017..e2842b447a 100644 --- a/fastlane/metadata/android/in/title.txt +++ b/fastlane/metadata/android/in/title.txt @@ -1 +1 @@ -Mindustry \ No newline at end of file +Mindustry diff --git a/fastlane/metadata/android/pl-PL/changelogs/104.3.txt b/fastlane/metadata/android/pl-PL/changelogs/104.3.txt index a6088a180f..a0c7542103 100644 --- a/fastlane/metadata/android/pl-PL/changelogs/104.3.txt +++ b/fastlane/metadata/android/pl-PL/changelogs/104.3.txt @@ -3,4 +3,4 @@ - Utworzono kategorie serwerów (dodane dzięki @Quezler) - Dodano funckję require() dla skryptów (dodane dzięki @DeltaNedas) - Dodano gradient kolorystyczny dla statusu baterii (dodane dzięki @Arkanic) -- Zmieniono ładowanie skryptów: dla modów z więcej niż jednym plikiem skryptowym, główny plik musi nazywać się "main.js" oraz musi zawierać require() do pozostałych plików \ No newline at end of file +- Zmieniono ładowanie skryptów: dla modów z więcej niż jednym plikiem skryptowym, główny plik musi nazywać się "main.js" oraz musi zawierać require() do pozostałych plików diff --git a/fastlane/metadata/android/pl-PL/changelogs/104.4.txt b/fastlane/metadata/android/pl-PL/changelogs/104.4.txt index 7dd8cc48dc..04976a469a 100644 --- a/fastlane/metadata/android/pl-PL/changelogs/104.4.txt +++ b/fastlane/metadata/android/pl-PL/changelogs/104.4.txt @@ -1,4 +1,4 @@ - Aktualizacja sugerowanych linków - Aktualizacja tłumaczeń - Poprawiono zmienianie nazwy gracza po tym jak serwer został zamknięty -- Dodano mnożnik paneli słonecznych \ No newline at end of file +- Dodano mnożnik paneli słonecznych diff --git a/fastlane/metadata/android/pl-PL/changelogs/104.5.txt b/fastlane/metadata/android/pl-PL/changelogs/104.5.txt index 7dd8cc48dc..04976a469a 100644 --- a/fastlane/metadata/android/pl-PL/changelogs/104.5.txt +++ b/fastlane/metadata/android/pl-PL/changelogs/104.5.txt @@ -1,4 +1,4 @@ - Aktualizacja sugerowanych linków - Aktualizacja tłumaczeń - Poprawiono zmienianie nazwy gracza po tym jak serwer został zamknięty -- Dodano mnożnik paneli słonecznych \ No newline at end of file +- Dodano mnożnik paneli słonecznych diff --git a/ios/build.gradle b/ios/build.gradle index 57b3dcb185..13578d00b1 100644 --- a/ios/build.gradle +++ b/ios/build.gradle @@ -26,7 +26,7 @@ task copyAssets(){ } delete{ - delete fileTree('assets') { + delete fileTree('assets'){ include '**/*.ogg' } } diff --git a/jitpack.yml b/jitpack.yml index e1dfa83815..c06db14182 100644 --- a/jitpack.yml +++ b/jitpack.yml @@ -1,4 +1,4 @@ before_install: - wget https://github.com/sormuras/bach/raw/master/install-jdk.sh - source install-jdk.sh --feature 14 - - jshell --version \ No newline at end of file + - jshell --version diff --git a/tests/src/test/java/ApplicationTests.java b/tests/src/test/java/ApplicationTests.java index 7dbff14310..c4ae93123a 100644 --- a/tests/src/test/java/ApplicationTests.java +++ b/tests/src/test/java/ApplicationTests.java @@ -554,7 +554,7 @@ public class ApplicationTests{ @Test void allBlockTest(){ - Tiles tiles = world.resize(256*3 + 20, 10); + Tiles tiles = world.resize(256 * 3 + 20, 10); world.beginMapLoad(); for(int x = 0; x < tiles.width; x++){