From 0d287e6d59e12dec62e72057838a9bfdd77422c2 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 21 Feb 2021 08:53:47 -0500 Subject: [PATCH] Water Extractor: Use metaglass to be consistent with pumps --- core/src/mindustry/content/Blocks.java | 2 +- desktop/src/mindustry/desktop/DesktopLauncher.java | 3 +-- gradle.properties | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index e9f8abf2a4..78d27b61a2 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1285,7 +1285,7 @@ public class Blocks implements ContentList{ }}; waterExtractor = new SolidPump("water-extractor"){{ - requirements(Category.production, with(Items.copper, 30, Items.graphite, 30, Items.lead, 30)); + requirements(Category.production, with(Items.metaglass, 30, Items.graphite, 30, Items.lead, 30)); result = Liquids.water; pumpAmount = 0.11f; size = 2; diff --git a/desktop/src/mindustry/desktop/DesktopLauncher.java b/desktop/src/mindustry/desktop/DesktopLauncher.java index ad8e03d5c0..29fe405905 100644 --- a/desktop/src/mindustry/desktop/DesktopLauncher.java +++ b/desktop/src/mindustry/desktop/DesktopLauncher.java @@ -64,8 +64,7 @@ public class DesktopLauncher extends ClientLauncher{ if(useSteam){ //delete leftover dlls - Fi file = new Fi("."); - for(Fi other : file.parent().list()){ + for(Fi other : new Fi(".").parent().list()){ if(other.name().contains("steam") && (other.extension().equals("dll") || other.extension().equals("so") || other.extension().equals("dylib"))){ other.delete(); } diff --git a/gradle.properties b/gradle.properties index 7ecfa9aaf8..f7f78d81b9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=1d7c415cd528ee0148fa2f498fcb1ec563528825 +archash=7e4bc7e1c7c25bdf4321a22356f6ddb1943f6d60