From 42497d86277731ec743fedced1c218a7a023b488 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 4 Jul 2021 09:55:12 -0400 Subject: [PATCH] ClassMap regen --- core/src/mindustry/maps/Maps.java | 4 ++-- core/src/mindustry/mod/ClassMap.java | 10 +++++----- core/src/mindustry/mod/Scripts.java | 5 +++-- ios/src/mindustry/ios/IOSLauncher.java | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/core/src/mindustry/maps/Maps.java b/core/src/mindustry/maps/Maps.java index 72fcc09aa1..46b74799d9 100644 --- a/core/src/mindustry/maps/Maps.java +++ b/core/src/mindustry/maps/Maps.java @@ -422,7 +422,7 @@ public class Maps{ } private void writeCache(Map map) throws IOException{ - try(DataOutputStream stream = new DataOutputStream(map.cacheFile().write(false, Streams.DEFAULT_BUFFER_SIZE))){ + try(DataOutputStream stream = new DataOutputStream(map.cacheFile().write(false, Streams.defaultBufferSize))){ stream.write(0); stream.writeInt(map.spawns); stream.write(map.teams.size); @@ -434,7 +434,7 @@ public class Maps{ } private void readCache(Map map) throws IOException{ - try(DataInputStream stream = new DataInputStream(map.cacheFile().read(Streams.DEFAULT_BUFFER_SIZE))){ + try(DataInputStream stream = new DataInputStream(map.cacheFile().read(Streams.defaultBufferSize))){ stream.read(); //version map.spawns = stream.readInt(); int teamsize = stream.readByte(); diff --git a/core/src/mindustry/mod/ClassMap.java b/core/src/mindustry/mod/ClassMap.java index e44f534458..71cfafe5d2 100644 --- a/core/src/mindustry/mod/ClassMap.java +++ b/core/src/mindustry/mod/ClassMap.java @@ -1,8 +1,6 @@ package mindustry.mod; import arc.struct.*; -import mindustry.world.blocks.payloads.*; - /** Generated class. Maps simple class names to concrete classes. For use in JSON mods. */ @SuppressWarnings("deprecation") public class ClassMap{ @@ -167,21 +165,21 @@ public class ClassMap{ classes.put("StackConveyor", mindustry.world.blocks.distribution.StackConveyor.class); classes.put("StackConveyorBuild", mindustry.world.blocks.distribution.StackConveyor.StackConveyorBuild.class); classes.put("AirBlock", mindustry.world.blocks.environment.AirBlock.class); - classes.put("Bush", mindustry.world.blocks.environment.Bush.class); classes.put("Cliff", mindustry.world.blocks.environment.Cliff.class); classes.put("DoubleOverlayFloor", mindustry.world.blocks.environment.DoubleOverlayFloor.class); classes.put("Floor", mindustry.world.blocks.environment.Floor.class); classes.put("OreBlock", mindustry.world.blocks.environment.OreBlock.class); classes.put("OverlayFloor", mindustry.world.blocks.environment.OverlayFloor.class); classes.put("Prop", mindustry.world.blocks.environment.Prop.class); + classes.put("SeaBush", mindustry.world.blocks.environment.SeaBush.class); + classes.put("Seaweed", mindustry.world.blocks.environment.Seaweed.class); classes.put("ShallowLiquid", mindustry.world.blocks.environment.ShallowLiquid.class); classes.put("SpawnBlock", mindustry.world.blocks.environment.SpawnBlock.class); - classes.put("StaticClusterWall", mindustry.world.blocks.environment.StaticClusterWall.class); + classes.put("StaticCoralWall", mindustry.world.blocks.environment.StaticCoralWall.class); classes.put("StaticTree", mindustry.world.blocks.environment.StaticTree.class); classes.put("StaticWall", mindustry.world.blocks.environment.StaticWall.class); classes.put("TreeBlock", mindustry.world.blocks.environment.TreeBlock.class); classes.put("WallOreBlock", mindustry.world.blocks.environment.WallOreBlock.class); - classes.put("WavingProp", mindustry.world.blocks.environment.WavingProp.class); classes.put("WobbleProp", mindustry.world.blocks.environment.WobbleProp.class); classes.put("BlockForge", mindustry.world.blocks.experimental.BlockForge.class); classes.put("BlockForgeBuild", mindustry.world.blocks.experimental.BlockForge.BlockForgeBuild.class); @@ -236,6 +234,8 @@ public class ClassMap{ classes.put("Payload", mindustry.world.blocks.payloads.Payload.class); classes.put("PayloadBlock", mindustry.world.blocks.payloads.PayloadBlock.class); classes.put("PayloadBlockBuild", mindustry.world.blocks.payloads.PayloadBlock.PayloadBlockBuild.class); + classes.put("PayloadDeconstructor", mindustry.world.blocks.payloads.PayloadDeconstructor.class); + classes.put("PayloadDeconstructorBuild", mindustry.world.blocks.payloads.PayloadDeconstructor.PayloadDeconstructorBuild.class); classes.put("PayloadMassDriver", mindustry.world.blocks.payloads.PayloadMassDriver.class); classes.put("PayloadDriverBuild", mindustry.world.blocks.payloads.PayloadMassDriver.PayloadDriverBuild.class); classes.put("PayloadDriverState", mindustry.world.blocks.payloads.PayloadMassDriver.PayloadDriverState.class); diff --git a/core/src/mindustry/mod/Scripts.java b/core/src/mindustry/mod/Scripts.java index 5d19d044ed..8dd10759bc 100644 --- a/core/src/mindustry/mod/Scripts.java +++ b/core/src/mindustry/mod/Scripts.java @@ -9,6 +9,7 @@ import arc.files.*; import arc.func.*; import arc.util.*; import arc.util.Log.*; +import arc.util.io.*; import mindustry.*; import mindustry.mod.Mods.*; import rhino.*; @@ -129,7 +130,7 @@ public class Scripts implements Disposable{ /** writeFile but for a byte[] */ public void writeBinFile(String purpose, String ext, byte[] contents){ - if(contents == null) contents = new byte[0]; + if(contents == null) contents = Streams.emptyBytes; final byte[] fContents = contents; selectFile(false, purpose, ext, fi -> fi.writeBytes(fContents)); } @@ -181,7 +182,7 @@ public class Scripts implements Disposable{ } private class ScriptModuleProvider extends UrlModuleSourceProvider{ - private Pattern directory = Pattern.compile("^(.+?)/(.+)"); + private final Pattern directory = Pattern.compile("^(.+?)/(.+)"); public ScriptModuleProvider(){ super(null, null); diff --git a/ios/src/mindustry/ios/IOSLauncher.java b/ios/src/mindustry/ios/IOSLauncher.java index 4171862d2b..efb0874504 100644 --- a/ios/src/mindustry/ios/IOSLauncher.java +++ b/ios/src/mindustry/ios/IOSLauncher.java @@ -219,7 +219,7 @@ public class IOSLauncher extends IOSApplication.Delegate{ if(SaveIO.isSaveValid(file)){ try{ - SaveMeta meta = SaveIO.getMeta(new DataInputStream(new InflaterInputStream(file.read(Streams.DEFAULT_BUFFER_SIZE)))); + SaveMeta meta = SaveIO.getMeta(new DataInputStream(new InflaterInputStream(file.read(Streams.defaultBufferSize)))); if(meta.tags.containsKey("name")){ //is map if(!ui.editor.isShown()){