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

Misc formatting

Browse Source
This commit is contained in:
Anuken
2022-07-15 16:18:11 -04:00
parent 695c19d0b0
commit f1917fea3e
4 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/core/Control.java
View File

@@ -275,9 +275,7 @@ public class Control implements ApplicationListener, Loadable{
} }
private void placeLandBuild(Building build){ private void placeLandBuild(Building build){
//TODO instance reuse bad?
build.tile.setBlock(build.block, build.team, build.rotation, () -> build); build.tile.setBlock(build.block, build.team, build.rotation, () -> build);
//TODO dropped bad?
build.dropped(); build.dropped();
Fx.coreBuildBlock.at(build.x, build.y, 0f, build.block); Fx.coreBuildBlock.at(build.x, build.y, 0f, build.block);

1
core/src/mindustry/editor/MapObjectivesCanvas.java
View File

@@ -384,6 +384,7 @@ public class MapObjectivesCanvas extends WidgetGroup{
row().table(Tex.buttonSelectTrans, t -> { row().table(Tex.buttonSelectTrans, t -> {
t.labelWrap(obj.typeName()).grow() t.labelWrap(obj.typeName()).grow()
.style(Styles.outlineLabel)
.color(Pal.accent).align(Align.left).padLeft(6f) .color(Pal.accent).align(Align.left).padLeft(6f)
.ellipsis(true).get().setAlignment(Align.left); .ellipsis(true).get().setAlignment(Align.left);

6
core/src/mindustry/ui/Fonts.java
View File

@@ -35,11 +35,7 @@ public class Fonts{
private static TextureRegion[] iconTable; private static TextureRegion[] iconTable;
private static int lastCid; private static int lastCid;
public static Font def; public static Font def, outline, icon, iconLarge, tech;
public static Font outline;
public static Font icon;
public static Font iconLarge;
public static Font tech;
public static TextureRegion logicIcon(int id){ public static TextureRegion logicIcon(int id){
return iconTable[id]; return iconTable[id];

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

@@ -53,7 +53,7 @@ public class ColorPicker extends BaseDialog{
t.row(); t.row();
t.defaults().padBottom(6).width(400f).height(44f); t.defaults().padBottom(6).width(370f).height(44f);
t.stack(new Image(new TextureRegion(hueTex)), hSlider = new Slider(0f, 360f, 0.3f, false){{ t.stack(new Image(new TextureRegion(hueTex)), hSlider = new Slider(0f, 360f, 0.3f, false){{
setValue(h); setValue(h);