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
2022-09-23 16:24:51 -04:00
parent 1d971231ca
commit b26f7625d8
4 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/mod/Mods.java
View File

@@ -353,9 +353,7 @@ public class Mods implements Loadable{
//dispose old atlas data //dispose old atlas data
Core.atlas = packer.flush(filter, new TextureAtlas()); Core.atlas = packer.flush(filter, new TextureAtlas());
Time.mark(); textureResize.each(e -> Core.atlas.find(e.key).scale = e.value);
textureResize.each(e -> { Core.atlas.find(e.key).scale = e.value; });
Log.debug("Time to rescale textures: @", Time.elapsed());
Core.atlas.setErrorRegion("error"); Core.atlas.setErrorRegion("error");
Log.debug("Total pages: @", Core.atlas.getTextures().size); Log.debug("Total pages: @", Core.atlas.getTextures().size);

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

@@ -21,7 +21,7 @@ import static mindustry.Vars.*;
public class CanvasBlock extends Block{ public class CanvasBlock extends Block{
public float padding = 0f; public float padding = 0f;
public int canvasSize = 8; public int canvasSize = 8;
public int[] palette = {0x634b7d_ff, 0xc45d9f_ff, 0xe39aac_ff, 0xf0dab1_ff, 0x6461c2_ff, 0x2ba9b4_ff, 0x93d4b5_ff, 0xf0f6e8_ff}; public int[] palette = {0x362944_ff, 0xc45d9f_ff, 0xe39aac_ff, 0xf0dab1_ff, 0x6461c2_ff, 0x2ba9b4_ff, 0x93d4b5_ff, 0xf0f6e8_ff};
public int bitsPerPixel; public int bitsPerPixel;
public IntIntMap colorToIndex = new IntIntMap(); public IntIntMap colorToIndex = new IntIntMap();

2
core/src/mindustry/world/meta/BuildVisibility.java
View File

@@ -2,7 +2,6 @@ package mindustry.world.meta;
import arc.func.*; import arc.func.*;
import mindustry.*; import mindustry.*;
import mindustry.content.*;
public class BuildVisibility{ public class BuildVisibility{
public static final BuildVisibility public static final BuildVisibility
@@ -14,7 +13,6 @@ public class BuildVisibility{
sandboxOnly = new BuildVisibility(() -> Vars.state == null || Vars.state.rules.infiniteResources), sandboxOnly = new BuildVisibility(() -> Vars.state == null || Vars.state.rules.infiniteResources),
campaignOnly = new BuildVisibility(() -> Vars.state == null || Vars.state.isCampaign()), campaignOnly = new BuildVisibility(() -> Vars.state == null || Vars.state.isCampaign()),
lightingOnly = new BuildVisibility(() -> Vars.state == null || Vars.state.rules.lighting || Vars.state.isCampaign()), lightingOnly = new BuildVisibility(() -> Vars.state == null || Vars.state.rules.lighting || Vars.state.isCampaign()),
berylliumOnly = new BuildVisibility(() -> !Vars.state.rules.hiddenBuildItems.contains(Items.beryllium)),
ammoOnly = new BuildVisibility(() -> Vars.state == null || Vars.state.rules.unitAmmo), ammoOnly = new BuildVisibility(() -> Vars.state == null || Vars.state.rules.unitAmmo),
fogOnly = new BuildVisibility(() -> Vars.state == null || Vars.state.rules.fog || Vars.state.rules.editor); fogOnly = new BuildVisibility(() -> Vars.state == null || Vars.state.rules.fog || Vars.state.rules.editor);

2
gradle.properties
View File

@@ -25,4 +25,4 @@ org.gradle.caching=true
#used for slow jitpack builds; TODO see if this actually works #used for slow jitpack builds; TODO see if this actually works
org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.socketTimeout=100000
org.gradle.internal.http.connectionTimeout=100000 org.gradle.internal.http.connectionTimeout=100000
archash=1ecc58862e archash=84813d7790