Let any block have variants. (#5372)

core/src/mindustry/world/blocks/defense/Wall.java

@@ -15,8 +15,6 @@ import mindustry.world.meta.*;
 import static mindustry.Vars.*;
 
 public class Wall extends Block{
-    public int variants = 0;
-
     /** Lighting chance. -1 to disable */
     public float lightningChance = -1f;
     public float lightningDamage = 20f;
@@ -51,20 +49,6 @@ public class Wall extends Block{
         }
     }
 
-    @Override
-    public void load(){
-        super.load();
-
-        if(variants != 0){
-            variantRegions = new TextureRegion[variants];
-
-            for(int i = 0; i < variants; i++){
-                variantRegions[i] = Core.atlas.find(name + (i + 1));
-            }
-            region = variantRegions[0];
-        }
-    }
-
     @Override
     public TextureRegion[] icons(){
         return new TextureRegion[]{Core.atlas.find(Core.atlas.has(name) ? name : name + "1")};

core/src/mindustry/world/blocks/environment/Floor.java

@@ -20,8 +20,6 @@ import mindustry.world.blocks.*;
 import static mindustry.Vars.*;
 
 public class Floor extends Block{
-    /** number of different variant regions to use */
-    public int variants = 3;
     /** edge fallback, used mainly for ores */
     public String edge = "stone";
     /** Multiplies unit velocity by this when walked on. */
@@ -76,6 +74,8 @@ public class Floor extends Block{
 
     public Floor(String name){
         super(name);
+
+        variants = 3;
     }
 
     public Floor(String name, int variants){
@@ -90,7 +90,6 @@ public class Floor extends Block{
         //load variant regions for drawing
         if(variants > 0){
             variantRegions = new TextureRegion[variants];
-
             for(int i = 0; i < variants; i++){
                 variantRegions[i] = Core.atlas.find(name + (i + 1));
             }
@@ -98,7 +97,6 @@ public class Floor extends Block{
             variantRegions = new TextureRegion[1];
             variantRegions[0] = Core.atlas.find(name);
         }
-
         int size = (int)(tilesize / Draw.scl);
         if(Core.atlas.has(name + "-edge")){
             edges = Core.atlas.find(name + "-edge").split(size, size);

core/src/mindustry/world/blocks/environment/Prop.java

@@ -7,8 +7,6 @@ import mindustry.content.*;
 import mindustry.world.*;
 
 public class Prop extends Block{
-    public int variants;
-
     public Prop(String name){
         super(name);
         breakable = true;
@@ -28,17 +26,4 @@ public class Prop extends Block{
     public TextureRegion[] icons(){
         return variants == 0 ? super.icons() : new TextureRegion[]{Core.atlas.find(name + "1")};
     }
-
-    @Override
-    public void load(){
-        super.load();
-
-        if(variants > 0){
-            variantRegions = new TextureRegion[variants];
-
-            for(int i = 0; i < variants; i++){
-                variantRegions[i] = Core.atlas.find(name + (i + 1));
-            }
-        }
-    }
 }