Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Anuken
2020-05-21 19:20:37 -04:00
parent 55effc54bb
commit 4787a68a08
5 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/content/Blocks.java
View File

@@ -118,7 +118,9 @@ public class Blocks implements ContentList{
public void drawBase(Tile tile){}
};
cliff = new Cliff("cliff");
cliff = new Cliff("cliff"){{
inEditor = false;
}};
//Registers build blocks
//no reference is needed here since they can be looked up by name later

2
core/src/mindustry/editor/MapEditorDialog.java
View File

@@ -684,7 +684,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
for(Block block : blocksOut){
TextureRegion region = block.icon(Cicon.medium);
if(!Core.atlas.isFound(region)) continue;
if(!Core.atlas.isFound(region) || !block.inEditor) continue;
ImageButton button = new ImageButton(Tex.whiteui, Styles.clearTogglei);
button.getStyle().imageUp = new TextureRegionDrawable(region);

9
core/src/mindustry/net/ArcNetProvider.java
View File

@@ -339,7 +339,6 @@ public class ArcNetProvider implements NetProvider{
@SuppressWarnings("unchecked")
public static class PacketSerializer implements NetSerializer{
static Cons2<Packet, ByteBuffer> writer = Packet::write;
@Override
public Object read(ByteBuffer byteBuffer){
@@ -359,13 +358,11 @@ public class ArcNetProvider implements NetProvider{
byteBuffer.put((byte)-2); //code for framework message
writeFramework(byteBuffer, (FrameworkMessage)o);
}else{
if(!(o instanceof Packet))
throw new RuntimeException("All sent objects must implement be Packets! Class: " + o.getClass());
if(!(o instanceof Packet)) throw new RuntimeException("All sent objects must implement be Packets! Class: " + o.getClass());
byte id = Registrator.getID(o.getClass());
if(id == -1)
throw new RuntimeException("Unregistered class: " + o.getClass());
if(id == -1) throw new RuntimeException("Unregistered class: " + o.getClass());
byteBuffer.put(id);
writer.get((Packet)o, byteBuffer);
((Packet)o).write(byteBuffer);
}
}

2
core/src/mindustry/world/Block.java
View File

@@ -56,6 +56,8 @@ public class Block extends UnlockableContent{
public final BlockBars bars = new BlockBars();
public final Consumers consumes = new Consumers();
/** whether this block is visible in the editor */
public boolean inEditor = true;
/** the last configuration value applied to this block. */
public @Nullable Object lastConfig;
/** whether to save the last config and apply it to newly placed blocks */