Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed spaces in brackets

Browse Source
This commit is contained in:
summetdev
2020-10-27 21:54:48 +03:00
parent a78faa57f3
commit 9a7e0fb45e
17 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
annotations/src/main/java/mindustry/annotations/BaseProcessor.java
View File

@@ -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<? extends TypeMirror> boundsMirrors = element.getBounds();
List<TypeName> 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<String> 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);
}
}

16
core/assets/shaders/atmosphere.frag
View File

@@ -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;

2
core/assets/shaders/blockbuild.frag
View File

@@ -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;

2
core/assets/shaders/planetgrid.vert
View File

@@ -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;

2
core/assets/shaders/unitbuild.frag
View File

@@ -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);

4
core/src/mindustry/editor/DrawOperation.java
View File

@@ -13,7 +13,7 @@ public class DrawOperation{
private MapEditor editor;
private LongSeq array = new LongSeq();
public DrawOperation(MapEditor editor) {
public DrawOperation(MapEditor editor){
this.editor = editor;
}
@@ -37,7 +37,7 @@ public class DrawOperation{
}
}
private void updateTile(int i) {
private void updateTile(int i){
long l = array.get(i);
array.set(i, TileOp.get(TileOp.x(l), TileOp.y(l), TileOp.type(l), getTile(editor.tile(TileOp.x(l), TileOp.y(l)), TileOp.type(l))));
setTile(editor.tile(TileOp.x(l), TileOp.y(l)), TileOp.type(l), TileOp.value(l));

8
core/src/mindustry/entities/bullet/BulletType.java
View File

@@ -158,7 +158,7 @@ public abstract class BulletType extends Content{
}
public void hitTile(Bullet b, Building tile, float initialHealth){
if(status == StatusEffects.burning) {
if(status == StatusEffects.burning){
Fires.create(tile.tile);
}
hit(b);
@@ -209,14 +209,14 @@ public abstract class BulletType extends Content{
Damage.status(b.team, x, y, splashDamageRadius, status, statusDuration, collidesAir, collidesGround);
}
if(healPercent > 0f) {
if(healPercent > 0f){
indexer.eachBlock(b.team, x, y, splashDamageRadius, other -> other.damaged(), other -> {
Fx.healBlockFull.at(other.x, other.y, other.block.size, Pal.heal);
other.heal(healPercent / 100f * other.maxHealth());
});
}
if(status == StatusEffects.burning) {
if(status == StatusEffects.burning){
indexer.eachBlock(null, x, y, splashDamageRadius, other -> other.team != b.team, other -> {
Fires.create(other.tile);
});
@@ -247,7 +247,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
}

2
core/src/mindustry/entities/comp/BulletComp.java
View File

@@ -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();
}
}

2
core/src/mindustry/ui/dialogs/PlanetDialog.java
View File

@@ -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[]");

2
core/src/mindustry/ui/fragments/PlacementFragment.java
View File

@@ -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<Block> blocks = getUnlockedByCategory(currentCategory);
Block currentBlock = getSelectedBlock(currentCategory);
for(int j = 0; j < blocks.size; j++){

2
core/src/mindustry/world/blocks/defense/turrets/TractorBeamTurret.java
View File

@@ -110,7 +110,7 @@ public class TractorBeamTurret extends BaseTurret{
}
@Override
public float efficiency() {
public float efficiency(){
return super.efficiency() * coolant;
}

2
core/src/mindustry/world/blocks/distribution/ArmoredConveyor.java
View File

@@ -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);
}

2
core/src/mindustry/world/blocks/distribution/Conveyor.java
View File

@@ -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;

2
core/src/mindustry/world/blocks/logic/LogicBlock.java
View File

@@ -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);
});

2
core/src/mindustry/world/blocks/power/PowerDiode.java
View File

@@ -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

2
core/src/mindustry/world/blocks/production/Pump.java
View File

@@ -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;

2
ios/build.gradle
View File

@@ -26,7 +26,7 @@ task copyAssets(){
}
delete{
delete fileTree('assets') {
delete fileTree('assets'){
include '**/*.ogg'
}
}