resolve conflicts

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

@@ -43,10 +43,10 @@ public class Wall extends Block{
     public void setStats(){
         super.setStats();
 
-        if(chanceDeflect > 0f) stats.add(BlockStat.baseDeflectChance, chanceDeflect, StatUnit.none);
+        if(chanceDeflect > 0f) stats.add(Stat.baseDeflectChance, chanceDeflect, StatUnit.none);
         if(lightningChance > 0f){
-            stats.add(BlockStat.lightningChance, lightningChance * 100f, StatUnit.percent);
-            stats.add(BlockStat.lightningDamage, lightningDamage, StatUnit.none);
+            stats.add(Stat.lightningChance, lightningChance * 100f, StatUnit.percent);
+            stats.add(Stat.lightningDamage, lightningDamage, StatUnit.none);
         }
     }
 

core/src/mindustry/world/meta/BlockStat.java

@@ -1,71 +0,0 @@
-package mindustry.world.meta;
-
-import arc.*;
-
-import java.util.*;
-
-/** Describes one type of stat for a block. */
-public enum BlockStat{
-    health(StatCategory.general),
-    size(StatCategory.general),
-    displaySize(StatCategory.general),
-    buildTime(StatCategory.general),
-    buildCost(StatCategory.general),
-    memoryCapacity(StatCategory.general),
-    baseDeflectChance(StatCategory.general), 
-    lightningChance(StatCategory.general),
-    lightningDamage(StatCategory.general),
-
-    itemCapacity(StatCategory.items),
-    itemsMoved(StatCategory.items),
-    launchTime(StatCategory.items),
-    maxConsecutive(StatCategory.items),
-
-    liquidCapacity(StatCategory.liquids),
-
-    powerCapacity(StatCategory.power),
-    powerUse(StatCategory.power),
-    powerDamage(StatCategory.power),
-    powerRange(StatCategory.power),
-    powerConnections(StatCategory.power),
-    basePowerGeneration(StatCategory.power),
-
-    tiles(StatCategory.crafting),
-    input(StatCategory.crafting),
-    output(StatCategory.crafting),
-    productionTime(StatCategory.crafting),
-    drillTier(StatCategory.crafting),
-    drillSpeed(StatCategory.crafting),
-    maxUnits(StatCategory.crafting),
-    linkRange(StatCategory.crafting),
-    instructions(StatCategory.crafting),
-
-    speedIncrease(StatCategory.shooting),
-    repairTime(StatCategory.shooting),
-    range(StatCategory.shooting),
-    shootRange(StatCategory.shooting),
-    inaccuracy(StatCategory.shooting),
-    shots(StatCategory.shooting),
-    reload(StatCategory.shooting),
-    powerShot(StatCategory.shooting),
-    targetsAir(StatCategory.shooting),
-    targetsGround(StatCategory.shooting),
-    damage(StatCategory.shooting),
-    ammo(StatCategory.shooting),
-    shieldHealth(StatCategory.shooting),
-    cooldownTime(StatCategory.shooting),
-
-    booster(StatCategory.optional),
-    boostEffect(StatCategory.optional),
-    affinities(StatCategory.optional);
-
-    public final StatCategory category;
-
-    BlockStat(StatCategory category){
-        this.category = category;
-    }
-
-    public String localized(){
-        return Core.bundle.get("blocks." + name().toLowerCase(Locale.ROOT));
-    }
-}

core/src/mindustry/world/meta/Stat.java

@@ -22,6 +22,9 @@ public enum Stat{
     buildSpeed,
     mineSpeed,
     mineTier,
+    baseDeflectChance,
+    lightningChance, 
+    lightningDamage,
 
     itemCapacity(StatCat.items),
     itemsMoved(StatCat.items),