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

Cleanup

Browse Source
This commit is contained in:
Anuken
2021-11-01 21:18:00 -04:00
parent a2d7f21518
commit 00bea730e0
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/type/Planet.java
View File

@@ -86,8 +86,6 @@ public class Planet extends UnlockableContent{
public Planet solarSystem; public Planet solarSystem;
/** All planets orbiting this one, in ascending order of radius. */ /** All planets orbiting this one, in ascending order of radius. */
public Seq<Planet> children = new Seq<>(); public Seq<Planet> children = new Seq<>();
/** Satellites orbiting this planet. */
public Seq<Satellite> satellites = new Seq<>();
/** Loads the mesh. Clientside only. Defaults to a boring sphere mesh. */ /** Loads the mesh. Clientside only. Defaults to a boring sphere mesh. */
protected Prov<GenericMesh> meshLoader = () -> new ShaderSphereMesh(this, Shaders.unlit, 2), cloudMeshLoader = () -> null; protected Prov<GenericMesh> meshLoader = () -> new ShaderSphereMesh(this, Shaders.unlit, 2), cloudMeshLoader = () -> null;
@@ -132,7 +130,7 @@ public class Planet extends UnlockableContent{
} }
} }
/** @deprecated confusing parameter orer, use the other constructor instead */ /** @deprecated confusing parameter order, use the other constructor instead */
@Deprecated @Deprecated
public Planet(String name, Planet parent, int sectorSize, float radius){ public Planet(String name, Planet parent, int sectorSize, float radius){
this(name, parent, radius, sectorSize); this(name, parent, radius, sectorSize);

3
core/src/mindustry/world/blocks/ItemSelection.java
View File

@@ -8,6 +8,7 @@ import arc.struct.*;
import arc.util.*; import arc.util.*;
import mindustry.ctype.*; import mindustry.ctype.*;
import mindustry.gen.*; import mindustry.gen.*;
import mindustry.type.*;
import mindustry.ui.*; import mindustry.ui.*;
import mindustry.world.*; import mindustry.world.*;
@@ -37,7 +38,7 @@ public class ItemSelection{
int i = 0; int i = 0;
for(T item : items){ for(T item : items){
if(!item.unlockedNow()) continue; if(!item.unlockedNow() || (item instanceof Item checkVisible && state.rules.hiddenBuildItems.contains(checkVisible))) continue;
ImageButton button = cont.button(Tex.whiteui, Styles.clearToggleTransi, 24, () -> { ImageButton button = cont.button(Tex.whiteui, Styles.clearToggleTransi, 24, () -> {
if(closeSelect) control.input.frag.config.hideConfig(); if(closeSelect) control.input.frag.config.hideConfig();