1
0
mirror of https://github.com/Anuken/Mindustry.git synced 2024-08-15 10:50:43 +03:00

[formatting] add newline to file(s) (#1508)

* Trail appropriate files with a new line

* For some ironic reason it ignored itself

Probably because it wasn’t tracked/commited yet.

* Rename newlines to server executable naming pattern
This commit is contained in:
Patrick 'Quezler' Mounier 2020-02-06 00:36:56 +01:00 committed by GitHub
parent 8bb533f646
commit e06d8eabec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
71 changed files with 84 additions and 68 deletions

View File

@ -82,4 +82,4 @@
<option name="CONTINUATION_INDENT_SIZE" value="0" />
</indentOptions>
</codeStyleSettings>
</code_scheme>
</code_scheme>

View File

@ -162,4 +162,4 @@ task run(type: Exec){
def adb = path + "/platform-tools/adb"
commandLine "$adb", 'shell', 'am', 'start', '-n', 'io.anuke.mindustry/mindustry.android.AndroidLauncher'
}
}

View File

@ -2,4 +2,4 @@
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@mipmap/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>
</adaptive-icon>

View File

@ -2,4 +2,4 @@
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@mipmap/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>
</adaptive-icon>

View File

@ -8,4 +8,4 @@
<item name="android:windowContentOverlay">@null</item>
<item name="android:windowFullscreen">true</item>
</style>
</resources>
</resources>

View File

@ -3,4 +3,4 @@
<string name="app_name">Mindustry</string>
</resources>
</resources>

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<full-backup-content>
</full-backup-content>
</full-backup-content>

View File

@ -921,4 +921,4 @@
"src": "fontawesome"
}
]
}
}

View File

@ -1254,4 +1254,4 @@ block.omega-mech-pad.description = Umožňuje přeměnu Tvého vozidla na těžc
block.javelin-ship-pad.description = Umožňuje přeměnu Tvého vozidla na rychlou, lehce obrněnou stíhačku.\nAktivuj kliknutím nebo ťupnutím, když se nacházíš nad plošinou.
block.trident-ship-pad.description = Umožňuje přeměnu Tvého vozidla na těžkého podpůrného bombardéra.\nAktivuj kliknutím nebo ťupnutím, když se nacházíš nad plošinou.
block.glaive-ship-pad.description = Umožňuje přeměnu Tvého vozidla na velkou, dobře obrněnou střeleckou loď.\nAktivuj kliknutím nebo ťupnutím, když se nacházíš nad plošinou.

View File

@ -17,4 +17,4 @@ const cons = method => new Cons(){get: method}
const prov = method => new Prov(){get: method}
const newEffect = (lifetime, renderer) => new Effects.Effect(lifetime, new Effects.EffectRenderer({render: renderer}))
Call = Packages.mindustry.gen.Call
const Calls = Call //backwards compat
const Calls = Call //backwards compat

View File

@ -1,4 +1,4 @@
apply plugin: "java"
sourceCompatibility = 1.8
[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
sourceSets.main.java.srcDirs = ["src/", "$buildDir/generated/sources/annotationProcessor/java/main"]
sourceSets.main.java.srcDirs = ["src/", "$buildDir/generated/sources/annotationProcessor/java/main"]

View File

@ -130,4 +130,4 @@ public interface Platform{
/** Stops forcing the app into landscape orientation.*/
default void endForceLandscape(){
}
}
}

View File

@ -337,4 +337,4 @@ public class MapEditor{
world.endMapLoad();
}
}
}
}

View File

@ -414,4 +414,4 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{
public void onSuperDeath(){
super.onDeath();
}
}
}

View File

@ -15,4 +15,4 @@ public enum UnitCommand{
public String localized(){
return localized;
}
}
}

View File

@ -176,4 +176,4 @@ public class MapIO{
interface TileProvider{
Tile get(int x, int y);
}
}
}

View File

@ -501,4 +501,4 @@ public class Maps{
return provider.next(previous);
}
}
}
}

View File

@ -39,4 +39,4 @@ public class TerrainFilter extends GenerateFilter{
in.block = Blocks.air;
}
}
}
}

View File

@ -418,4 +418,4 @@ public class ArcNetProvider implements NetProvider{
}
}
}
}

View File

@ -65,4 +65,4 @@ public class Interpolator{
}
}
}
}

View File

@ -91,4 +91,4 @@ public class CustomGameDialog extends FloatingDialog{
cont.add(pane).uniformX();
}
}
}

View File

@ -288,4 +288,4 @@ public class BranchTreeLayout implements TreeLayout{
public enum TreeAlignment{
center, towardsRoot, awayFromRoot
}
}
}

View File

@ -221,4 +221,4 @@ public class Floor extends Block{
return block.edges()[x][2 - y];
}
}
}

View File

@ -379,4 +379,4 @@ public class Conveyor extends Block implements Autotiler{
}
}
}
}
}

View File

@ -18,4 +18,4 @@ public class FloorValue implements StatValue{
table.add(new Image(floor.icon(Cicon.small))).padRight(3);
table.add(floor.localizedName).padRight(3);
}
}
}

View File

@ -1 +1 @@
Mindustry
Mindustry

View File

@ -1,3 +1,3 @@
- Fixed incorrect attribution in credits; music was made by "A Drop A Day"
- Removed unneeded 3.5 upgrade dialog that sometimes showed up in main menu
- Added information dialog regarding v4 beta
- Added information dialog regarding v4 beta

View File

@ -1,4 +1,4 @@
- Fixed incorrect attribution in credits; music was made by "A Drop A Day"
- Removed unneeded 3.5 upgrade dialog that sometimes showed up in main menu
- Added information dialog regarding v4 beta
- Fixed Discord link
- Fixed Discord link

View File

@ -1 +1 @@
sound.
sound.

View File

@ -1 +1 @@
everything
everything

View File

@ -1 +1 @@
Fixed some minor sound/multiplayer issues
Fixed some minor sound/multiplayer issues

View File

@ -1 +1 @@
Bugfixes
Bugfixes

View File

@ -1 +1 @@
Added ambient sounds for machines.
Added ambient sounds for machines.

View File

@ -1,2 +1,2 @@
The first release of version 4.0; an update that has been in the works for over a year.
Extensive changes, including new gamemodes, customizable rules, a new editor, new graphics, new enemies, unit production, new progression, a campaign, and more. See the in-game changelog link for specific details of what has been added and removed over the past year.
Extensive changes, including new gamemodes, customizable rules, a new editor, new graphics, new enemies, unit production, new progression, a campaign, and more. See the in-game changelog link for specific details of what has been added and removed over the past year.

View File

@ -1,2 +1,2 @@
Fixed multiplayer not syncing positions and shots correctly on certain networks or situations.
Various other bugfixes.
Various other bugfixes.

View File

@ -2,4 +2,4 @@
- Fixed wave timer being extremely slow at high TPS with multithreading enabled
- Fixed scrolling on player menu causing the whole screen to pan
- Updated Polish translation
- Updated Russian translation with new text (Thanks to @Prosta4okua)
- Updated Russian translation with new text (Thanks to @Prosta4okua)

View File

@ -11,4 +11,4 @@ Feature include:
- Cross-platform multiplayer via local networks or dedicated servers
- Custom game rules: Change block costs, enemy stats, starting items, wave timing and more
- A powerful editor, with tools to randomly generate ores, terrain, decoration and apply symmetry to maps
- Customizable map wave layouts
- Customizable map wave layouts

View File

@ -1 +1 @@
A factory-based sandbox tower defense game.
A factory-based sandbox tower defense game.

View File

@ -1 +1 @@
A factory-based sandbox tower defense game.
A factory-based sandbox tower defense game.

View File

@ -1 +1 @@
Mindustry
Mindustry

View File

@ -1 +1 @@
Mindustry
Mindustry

View File

@ -0,0 +1 @@

View File

@ -2,4 +2,4 @@
- Aggiunta regola della salute dei blocchi
- Aggiunte ulteriori squadre interne per modalità di gioco alternative
- Aggiunte funzionalità per migliorare il server modding
- Cambiamenti interni: il package ora è "mindustry" invece di "io.anuke.mindustry" (i plugin non funzioneranno)
- Cambiamenti interni: il package ora è "mindustry" invece di "io.anuke.mindustry" (i plugin non funzioneranno)

View File

@ -11,4 +11,4 @@ Funzionalità:
- Modalità multigiocatore cross-platform attraverso la rete locale o i server dedicati
- Regole di gioco personalizzate: modifica i costi dei blocchi, le statistiche nemiche, gli oggetti di partenza, i tempi tra le ondate e molto altro
- Un editor potente, con strumenti che permettono di generare i minerali in modo casuale, il terreno, le decorazioni e applicare simmetria alle mappe
- Ondate delle mappe completamente personalizzabili
- Ondate delle mappe completamente personalizzabili

View File

@ -1 +1 @@
Un gioco sandbox basato sulla produzione e sulla difesa.
Un gioco sandbox basato sulla produzione e sulla difesa.

View File

@ -1 +1 @@
Un gioco sandbox basato sulla produzione e sulla difesa.
Un gioco sandbox basato sulla produzione e sulla difesa.

View File

@ -1 +1 @@
Mindustry
Mindustry

View File

@ -0,0 +1 @@

View File

@ -11,4 +11,4 @@ Mindustryの特徴:
- ローカルネットワークや専用サーバーで、クロスプラットフォームのマルチプレイが可能
- カスタマイズ可能なゲーム: ブロックのコスト変更、敵のステータス、初期アイテム、ウェーブのタイミング など…
- 強力なエディター、鉱石をランダムに生成したり、地形、デコレーション、左右対称なマップも制作可能
- マップごとにウェーブの構成もカスタマイズ可能
- マップごとにウェーブの構成もカスタマイズ可能

View File

@ -1 +1 @@
工場ベースのサンドボックスタワーディフェンスゲーム。
工場ベースのサンドボックスタワーディフェンスゲーム。

View File

@ -1 +1 @@
Mindustry
Mindustry

View File

@ -1 +1 @@
Bazująca na przetrwaniu i zarządzaniu fabryką sandboxowa gra typu obrony wieży.
Bazująca na przetrwaniu i zarządzaniu fabryką sandboxowa gra typu obrony wieży.

View File

@ -1 +1 @@
Bazująca na przetrwaniu i zarządzaniu fabryką sandboxowa gra typu obrony wieży.
Bazująca na przetrwaniu i zarządzaniu fabryką sandboxowa gra typu obrony wieży.

View File

@ -1 +1 @@
Mindustry
Mindustry

View File

@ -2,4 +2,4 @@
- Foi adicionada regra de integridade do bloco
- Adicionado mais equipes internas para modos de jogo alternativos
- Adicionado recursos para melhorar a modificação do servidor
-Grande mudança interna: o pacote agora é "mindustry" em vez de "io.anuke.mindustry" (irá quebrar os plugins)
-Grande mudança interna: o pacote agora é "mindustry" em vez de "io.anuke.mindustry" (irá quebrar os plugins)

View File

@ -11,4 +11,4 @@ Recursos incluidos:
- Multijogador multiplataforma através de redes locais ou servidores dedicados
- Regras personalizadas do jogo: altere os custos de bloqueio, estatísticas do inimigo, itens iniciais, tempo das ondas e muito mais
- Um editor poderoso, com ferramentas para gerar aleatoriamente minérios, terrenos, decoração e aplicar simetria a mapas
- Layouts de rondas de mapa personalizáveis
- Layouts de rondas de mapa personalizáveis

View File

@ -1 +1 @@
Um jogo de defesa de torre de sandbox baseado em construção.
Um jogo de defesa de torre de sandbox baseado em construção.

View File

@ -1 +1 @@
Mindustry
Mindustry

View File

@ -12,4 +12,4 @@
- Кроссплатформенный мультиплеер с поддержкой как и локальных сетей, так и серверов
- Пользовательские настройки игры — изменяйте цену блоков, силу врагов, количество стартовых ресурсов, интервал между волнами и т.д.
- Редактор карт с бесчисленными возможностями, инструментами для случайной генерации руд, рельефа, декораций, а также для симметрии карт
- Настраиваемые раскладки волн для карт
- Настраиваемые раскладки волн для карт

View File

@ -1 +1 @@
Mindustry
Mindustry

View File

@ -1 +1 @@
Mindustry
Mindustry

View File

@ -1 +1 @@
Mindustry
Mindustry

View File

@ -113,4 +113,4 @@
"version": 1,
"author": "xcode"
}
}
}

View File

@ -3,4 +3,4 @@
"version": 1,
"author": "xcode"
}
}
}

View File

@ -1 +1 @@
java -jar server.jar
java -jar server.jar

View File

@ -1 +1 @@
java -jar server.jar
java -jar server.jar

View File

@ -82,4 +82,4 @@ public class ServerLauncher implements ApplicationListener{
Events.fire(new ServerLoadEvent());
}
}
}

View File

@ -2,4 +2,4 @@
{
"address": "mindustry.us.to:6568"
}
]
]

View File

@ -8,4 +8,4 @@ sourceSets{
srcDir "src/test/resources"
}
}
}
}

View File

@ -447,4 +447,4 @@ public class ApplicationTests{
tile.block().handleStack(item, 1, tile, unit);
assertEquals(capacity, tile.entity.items.get(item));
}
}
}

14
tools/run-newline Executable file
View File

@ -0,0 +1,14 @@
#!/usr/bin/env bash
# add newlines to all files
git ls-files -z | while IFS= read -rd '' f; do tail -c1 < "$f" | read -r _ || echo >> "$f"; done
# undo the changes in these
git checkout -- "*.png"
git checkout -- "*.msav"
git checkout -- "*.jar"
git checkout -- "*.ogg"
git checkout -- "*.ico"
git checkout -- "*.icns"
git checkout -- "*.ttf"
git checkout -- "*.glsl"