From dc6617cfadd8c2b1c3049b1e53035576c430af12 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 9 Jun 2022 09:52:44 -0400
Subject: [PATCH] Threads update

---
 core/assets/logicids.dat                      | Bin 4496 -> 4509 bytes
 core/src/mindustry/Vars.java                  |   2 +-
 core/src/mindustry/world/meta/StatValues.java |   4 ++--
 gradle.properties                             |   2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/assets/logicids.dat b/core/assets/logicids.dat
index bd65fa5e70e9428a3bc3bcb38b96fadf8978f457..26b7474472e61bf73016057525807eaeadd57b69 100644
GIT binary patch
delta 28
jcmbQBJXe{C;p0Z8em-vQ;+({E-Hg=4lGM%pe2mNhh3^Rb

delta 16
YcmbQMJVBX>;loCze!k7~`2I5i05P)$761SM

diff --git a/core/src/mindustry/Vars.java b/core/src/mindustry/Vars.java
index 84039fcfa2..7151312f83 100644
--- a/core/src/mindustry/Vars.java
+++ b/core/src/mindustry/Vars.java
@@ -214,7 +214,7 @@ public class Vars implements Loadable{
     public static Locale[] locales;
 
     //the main executor will only have at most [cores] number of threads active
-    public static ExecutorService mainExecutor = Threads.cachedExecutor(1, OS.cores, true);
+    public static ExecutorService mainExecutor = Threads.executor("Main Executor", OS.cores);
 
     public static FileTree tree = new FileTree();
     public static Net net;
diff --git a/core/src/mindustry/world/meta/StatValues.java b/core/src/mindustry/world/meta/StatValues.java
index 7e3551eb10..c7bfc06b2b 100644
--- a/core/src/mindustry/world/meta/StatValues.java
+++ b/core/src/mindustry/world/meta/StatValues.java
@@ -70,7 +70,7 @@ public class StatValues{
 
     public static StatValue liquids(Boolf<Liquid> filter, float amount, boolean perSecond){
         return table -> {
-            Seq<Liquid> list = content.liquids().select(i -> filter.get(i) && i.unlockedNow());
+            Seq<Liquid> list = content.liquids().select(i -> filter.get(i) && i.unlockedNow() && !i.isHidden());
 
             for(int i = 0; i < list.size; i++){
                 table.add(new LiquidDisplay(list.get(i), amount, perSecond)).padRight(5);
@@ -120,7 +120,7 @@ public class StatValues{
 
     public static StatValue items(float timePeriod, Boolf<Item> filter){
         return table -> {
-            Seq<Item> list = content.items().select(i -> filter.get(i) && i.unlockedNow());
+            Seq<Item> list = content.items().select(i -> filter.get(i) && i.unlockedNow() && !i.isHidden());
 
             for(int i = 0; i < list.size; i++){
                 Item item = list.get(i);
diff --git a/gradle.properties b/gradle.properties
index 7f00435190..79506edbd7 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=52dd2290d0
+archash=5a5b338905