From fc4f8619f8486444ab299e61fb41c3e8a7249425 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 22 Apr 2020 16:17:43 -0400
Subject: [PATCH] progress (purge)

---
 .../java/mindustry/annotations/Annotations.java   | 15 ---------------
 core/src/mindustry/entities/def/TileComp.java     |  6 ------
 core/src/mindustry/world/Block.java               |  4 ----
 gradle.properties                                 |  2 +-
 4 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/annotations/src/main/java/mindustry/annotations/Annotations.java b/annotations/src/main/java/mindustry/annotations/Annotations.java
index fd4fe37f51..d15a137378 100644
--- a/annotations/src/main/java/mindustry/annotations/Annotations.java
+++ b/annotations/src/main/java/mindustry/annotations/Annotations.java
@@ -5,21 +5,6 @@ import java.lang.annotation.*;
 public class Annotations{
     //region entity interfaces
 
-    public enum DrawLayer{
-        floor,
-        floorOver,
-        groundShadows,
-        groundUnder,
-        ground,
-        flyingShadows,
-        flying,
-        bullets,
-        effects,
-        overlays,
-        names,
-        weather
-    }
-
     /** Indicates that a method overrides other methods. */
     @Target({ElementType.METHOD})
     @Retention(RetentionPolicy.SOURCE)
diff --git a/core/src/mindustry/entities/def/TileComp.java b/core/src/mindustry/entities/def/TileComp.java
index a72bcf39c6..eb1c7ef0ad 100644
--- a/core/src/mindustry/entities/def/TileComp.java
+++ b/core/src/mindustry/entities/def/TileComp.java
@@ -615,12 +615,6 @@ abstract class TileComp implements Posc, Teamc, Healthc, Tilec, Timerc, QuadTree
         }
     }
 
-    public void drawLayer(){
-    }
-
-    public void drawLayer2(){
-    }
-
     public void drawCracks(){
         if(!damaged() || block.size > Block.maxCrackSize) return;
         int id = pos();
diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java
index 09e9698983..9e651ca5c3 100644
--- a/core/src/mindustry/world/Block.java
+++ b/core/src/mindustry/world/Block.java
@@ -89,10 +89,6 @@ public class Block extends UnlockableContent{
     public CacheLayer cacheLayer = CacheLayer.normal;
     /** Special flag; if false, floor will be drawn under this block even if it is cached. */
     public boolean fillsTile = true;
-    /** Layer to draw extra stuff on. */
-    public Layer layer = null;
-    /** Extra layer to draw extra extra stuff on. */
-    public Layer layer2 = null;
     /** whether this block can be replaced in all cases */
     public boolean alwaysReplace = false;
     /** The block group. Unless {@link #canReplace} is overriden, blocks in the same group can replace each other. */
diff --git a/gradle.properties b/gradle.properties
index fe46140e70..6b1870e26c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=87ff7abf2af82712cc428c377833d83259d30f72
+archash=67f230afedd76d2d12ba3bb3e07116f8f0edd526