From 67b4fa6f6835d76aeb06e0e14dd250f7050a651d Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 27 Jul 2019 12:21:32 -0400 Subject: [PATCH] Map tweaks --- core/assets/bundles/bundle.properties | 3 ++ core/assets/maps/shattered.msav | Bin 16239 -> 16304 bytes .../mindustry/editor/MapGenerateDialog.java | 2 +- .../io/anuke/mindustry/net/ArcNetServer.java | 26 ++++++++---------- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index fe92fb9a3b..3275112948 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -267,6 +267,9 @@ toolmode.drawteams.description = Draw teams instead of blocks. filters.empty = [lightgray]No filters! Add one with the button below. filter.distort = Distort filter.noise = Noise +filter.median = Median +filter.blend = Blend +filter.defaultores = Default Ores filter.ore = Ore filter.rivernoise = River Noise filter.mirror = Mirror diff --git a/core/assets/maps/shattered.msav b/core/assets/maps/shattered.msav index 3164e822235fa551760241b548948bfe7c8781cc..cad5016e9dd0c8d2605197b2a543b49711545b36 100644 GIT binary patch literal 16304 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 literal 16239 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 dW2NBcH^SMX-Y=eqe8^`jF { + selection.cont.addButton("$filter.defaultores", () -> { addDefaultOres(filters); rebuildFilters(); update(); diff --git a/net/src/io/anuke/mindustry/net/ArcNetServer.java b/net/src/io/anuke/mindustry/net/ArcNetServer.java index 0da624635e..ed8496a8e2 100644 --- a/net/src/io/anuke/mindustry/net/ArcNetServer.java +++ b/net/src/io/anuke/mindustry/net/ArcNetServer.java @@ -1,23 +1,19 @@ package io.anuke.mindustry.net; -import com.dosse.upnp.UPnP; -import io.anuke.arc.Core; -import io.anuke.arc.collection.Array; +import com.dosse.upnp.*; +import io.anuke.arc.*; +import io.anuke.arc.collection.*; import io.anuke.arc.net.*; -import io.anuke.arc.util.Log; -import io.anuke.arc.util.Time; -import io.anuke.mindustry.Vars; -import io.anuke.mindustry.net.Net.SendMode; -import io.anuke.mindustry.net.Net.ServerProvider; +import io.anuke.arc.util.*; +import io.anuke.mindustry.*; +import io.anuke.mindustry.net.Net.*; import io.anuke.mindustry.net.Packets.*; -import net.jpountz.lz4.LZ4Compressor; -import net.jpountz.lz4.LZ4Factory; +import net.jpountz.lz4.*; -import java.io.IOException; -import java.nio.ByteBuffer; -import java.nio.channels.ClosedSelectorException; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.concurrent.CopyOnWriteArraySet; +import java.io.*; +import java.nio.*; +import java.nio.channels.*; +import java.util.concurrent.*; import static io.anuke.mindustry.Vars.*;