From b26f7625d8eac052798ff4972a61e5249892dcda Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 23 Sep 2022 16:24:51 -0400 Subject: [PATCH] Cleanup --- core/src/mindustry/mod/Mods.java | 4 +--- core/src/mindustry/world/blocks/logic/CanvasBlock.java | 2 +- core/src/mindustry/world/meta/BuildVisibility.java | 2 -- gradle.properties | 2 +- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/core/src/mindustry/mod/Mods.java b/core/src/mindustry/mod/Mods.java index fa23ae668c..ce28e46602 100644 --- a/core/src/mindustry/mod/Mods.java +++ b/core/src/mindustry/mod/Mods.java @@ -353,9 +353,7 @@ public class Mods implements Loadable{ //dispose old atlas data Core.atlas = packer.flush(filter, new TextureAtlas()); - Time.mark(); - textureResize.each(e -> { Core.atlas.find(e.key).scale = e.value; }); - Log.debug("Time to rescale textures: @", Time.elapsed()); + textureResize.each(e -> Core.atlas.find(e.key).scale = e.value); Core.atlas.setErrorRegion("error"); Log.debug("Total pages: @", Core.atlas.getTextures().size); diff --git a/core/src/mindustry/world/blocks/logic/CanvasBlock.java b/core/src/mindustry/world/blocks/logic/CanvasBlock.java index e30ff4dc57..09ef5c373c 100644 --- a/core/src/mindustry/world/blocks/logic/CanvasBlock.java +++ b/core/src/mindustry/world/blocks/logic/CanvasBlock.java @@ -21,7 +21,7 @@ import static mindustry.Vars.*; public class CanvasBlock extends Block{ public float padding = 0f; 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 IntIntMap colorToIndex = new IntIntMap(); diff --git a/core/src/mindustry/world/meta/BuildVisibility.java b/core/src/mindustry/world/meta/BuildVisibility.java index 10396f5312..ee84452779 100644 --- a/core/src/mindustry/world/meta/BuildVisibility.java +++ b/core/src/mindustry/world/meta/BuildVisibility.java @@ -2,7 +2,6 @@ package mindustry.world.meta; import arc.func.*; import mindustry.*; -import mindustry.content.*; public class BuildVisibility{ public static final BuildVisibility @@ -14,7 +13,6 @@ public class BuildVisibility{ sandboxOnly = new BuildVisibility(() -> Vars.state == null || Vars.state.rules.infiniteResources), campaignOnly = new BuildVisibility(() -> Vars.state == null || 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), fogOnly = new BuildVisibility(() -> Vars.state == null || Vars.state.rules.fog || Vars.state.rules.editor); diff --git a/gradle.properties b/gradle.properties index 85c0be4d22..ffebb82127 100644 --- a/gradle.properties +++ b/gradle.properties @@ -25,4 +25,4 @@ org.gradle.caching=true #used for slow jitpack builds; TODO see if this actually works org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.connectionTimeout=100000 -archash=1ecc58862e +archash=84813d7790