From c0f14185a8c4edf8b895722cf3a39662850d60fd Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 25 Dec 2019 12:35:23 -0500 Subject: [PATCH] More fixes --- core/src/mindustry/maps/Maps.java | 2 +- core/src/mindustry/mod/Scripts.java | 2 +- tools/src/mindustry/tools/Upscaler.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/mindustry/maps/Maps.java b/core/src/mindustry/maps/Maps.java index ca93997c57..2f4cbc3214 100644 --- a/core/src/mindustry/maps/Maps.java +++ b/core/src/mindustry/maps/Maps.java @@ -329,7 +329,7 @@ public class Maps{ return filters; }else{ try{ - return JsonIO.read(Array.class, str.replace("mindustrz", "mindustry")); + return JsonIO.read(Array.class, str); }catch(Exception e){ e.printStackTrace(); return readFilters(""); diff --git a/core/src/mindustry/mod/Scripts.java b/core/src/mindustry/mod/Scripts.java index 0a42566a95..7a39b774a7 100644 --- a/core/src/mindustry/mod/Scripts.java +++ b/core/src/mindustry/mod/Scripts.java @@ -20,7 +20,7 @@ public class Scripts implements Disposable{ context = Vars.platform.getScriptContext(); context.setClassShutter(type -> (ClassAccess.allowedClassNames.contains(type) || type.startsWith("$Proxy") || type.startsWith("adapter") || type.contains("PrintStream") || - type.startsWith("io.anuke.mindustry")) && !type.equals("mindustry.mod.ClassAccess")); + type.startsWith("mindustry")) && !type.equals("mindustry.mod.ClassAccess")); scope = new ImporterTopLevel(context); wrapper = Core.files.internal("scripts/wrapper.js").readString(); diff --git a/tools/src/mindustry/tools/Upscaler.java b/tools/src/mindustry/tools/Upscaler.java index 1afa31812d..de83fad5c0 100644 --- a/tools/src/mindustry/tools/Upscaler.java +++ b/tools/src/mindustry/tools/Upscaler.java @@ -1,7 +1,7 @@ package mindustry.tools; import arc.*; -import io.anuke.arc.backends.sdl.*; +import arc.backend.sdl.*; import arc.files.*; import arc.graphics.*; import arc.graphics.g2d.*;