From e62c2f9d8ea12fc3e51d8f7b60f4ce998ef40ff3 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 22 May 2022 09:00:32 -0400
Subject: [PATCH] UnitType type -> class

---
 core/src/mindustry/mod/ContentParser.java           | 2 +-
 core/src/mindustry/world/draw/DrawBlurSpin.java     | 1 -
 core/src/mindustry/world/draw/DrawGlowRegion.java   | 1 -
 core/src/mindustry/world/draw/DrawHeatInput.java    | 1 -
 core/src/mindustry/world/draw/DrawHeatRegion.java   | 1 -
 core/src/mindustry/world/draw/DrawLiquidRegion.java | 1 -
 core/src/mindustry/world/draw/DrawLiquidTile.java   | 1 -
 core/src/mindustry/world/draw/DrawMultiWeave.java   | 1 -
 core/src/mindustry/world/draw/DrawParticles.java    | 1 -
 core/src/mindustry/world/draw/DrawRegion.java       | 1 -
 10 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/core/src/mindustry/mod/ContentParser.java b/core/src/mindustry/mod/ContentParser.java
index 39c7f9bfba..acb1d8b5a5 100644
--- a/core/src/mindustry/mod/ContentParser.java
+++ b/core/src/mindustry/mod/ContentParser.java
@@ -438,7 +438,7 @@ public class ContentParser{
             UnitType unit;
             if(locate(ContentType.unit, name) == null){
 
-                unit = make(resolve(value.getString("type", ""), UnitType.class), mod + "-" + name);
+                unit = make(resolve(value.getString("class", ""), UnitType.class), mod + "-" + name);
 
                 var typeVal = value.get("type");
 
diff --git a/core/src/mindustry/world/draw/DrawBlurSpin.java b/core/src/mindustry/world/draw/DrawBlurSpin.java
index eadc685047..75d151c6c8 100644
--- a/core/src/mindustry/world/draw/DrawBlurSpin.java
+++ b/core/src/mindustry/world/draw/DrawBlurSpin.java
@@ -6,7 +6,6 @@ import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.world.*;
 
-/** Not standalone. */
 public class DrawBlurSpin extends DrawBlock{
     public TextureRegion region, blurRegion;
     public String suffix = "";
diff --git a/core/src/mindustry/world/draw/DrawGlowRegion.java b/core/src/mindustry/world/draw/DrawGlowRegion.java
index 2290578a36..15a34fc2b7 100644
--- a/core/src/mindustry/world/draw/DrawGlowRegion.java
+++ b/core/src/mindustry/world/draw/DrawGlowRegion.java
@@ -8,7 +8,6 @@ import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.world.*;
 
-/** Not standalone. */
 public class DrawGlowRegion extends DrawBlock{
     public Blending blending = Blending.additive;
     public String suffix = "-glow";
diff --git a/core/src/mindustry/world/draw/DrawHeatInput.java b/core/src/mindustry/world/draw/DrawHeatInput.java
index 5cfef06bfd..51f49cc0d5 100644
--- a/core/src/mindustry/world/draw/DrawHeatInput.java
+++ b/core/src/mindustry/world/draw/DrawHeatInput.java
@@ -11,7 +11,6 @@ import mindustry.graphics.*;
 import mindustry.world.*;
 import mindustry.world.blocks.heat.*;
 
-/** Not standalone. */
 public class DrawHeatInput extends DrawBlock{
     public String suffix = "-heat";
     public Color heatColor = new Color(1f, 0.22f, 0.22f, 0.8f);
diff --git a/core/src/mindustry/world/draw/DrawHeatRegion.java b/core/src/mindustry/world/draw/DrawHeatRegion.java
index c2cf677506..8b2ccd129d 100644
--- a/core/src/mindustry/world/draw/DrawHeatRegion.java
+++ b/core/src/mindustry/world/draw/DrawHeatRegion.java
@@ -9,7 +9,6 @@ import mindustry.graphics.*;
 import mindustry.world.*;
 import mindustry.world.blocks.production.HeatCrafter.*;
 
-/** Not standalone. */
 public class DrawHeatRegion extends DrawBlock{
     public Color color = new Color(1f, 0.22f, 0.22f, 0.8f);
     public float pulse = 0.3f, pulseScl = 10f;
diff --git a/core/src/mindustry/world/draw/DrawLiquidRegion.java b/core/src/mindustry/world/draw/DrawLiquidRegion.java
index 8d4d775afa..e22daa7c9e 100644
--- a/core/src/mindustry/world/draw/DrawLiquidRegion.java
+++ b/core/src/mindustry/world/draw/DrawLiquidRegion.java
@@ -7,7 +7,6 @@ import mindustry.graphics.*;
 import mindustry.type.*;
 import mindustry.world.*;
 
-/** Not standalone. */
 public class DrawLiquidRegion extends DrawBlock{
     public Liquid drawLiquid;
     public TextureRegion liquid;
diff --git a/core/src/mindustry/world/draw/DrawLiquidTile.java b/core/src/mindustry/world/draw/DrawLiquidTile.java
index 96ef29bd86..b2e8ded858 100644
--- a/core/src/mindustry/world/draw/DrawLiquidTile.java
+++ b/core/src/mindustry/world/draw/DrawLiquidTile.java
@@ -4,7 +4,6 @@ import mindustry.gen.*;
 import mindustry.type.*;
 import mindustry.world.blocks.liquid.*;
 
-/** Not standalone. */
 public class DrawLiquidTile extends DrawBlock{
     public Liquid drawLiquid;
     public float padding;
diff --git a/core/src/mindustry/world/draw/DrawMultiWeave.java b/core/src/mindustry/world/draw/DrawMultiWeave.java
index 33d7b2ff15..a8bd312bbf 100644
--- a/core/src/mindustry/world/draw/DrawMultiWeave.java
+++ b/core/src/mindustry/world/draw/DrawMultiWeave.java
@@ -7,7 +7,6 @@ import arc.math.*;
 import mindustry.gen.*;
 import mindustry.world.*;
 
-/** Not standalone. */
 public class DrawMultiWeave extends DrawBlock{
     public TextureRegion weave, glow;
     public float rotateSpeed = 1f, rotateSpeed2 = -0.9f;
diff --git a/core/src/mindustry/world/draw/DrawParticles.java b/core/src/mindustry/world/draw/DrawParticles.java
index 171a904b6e..467e668296 100644
--- a/core/src/mindustry/world/draw/DrawParticles.java
+++ b/core/src/mindustry/world/draw/DrawParticles.java
@@ -7,7 +7,6 @@ import arc.math.Interp.*;
 import arc.util.*;
 import mindustry.gen.*;
 
-/** Not standalone. */
 public class DrawParticles extends DrawBlock{
     public Color color = Color.valueOf("f2d585");
 
diff --git a/core/src/mindustry/world/draw/DrawRegion.java b/core/src/mindustry/world/draw/DrawRegion.java
index 1a77195ed9..df04838cfd 100644
--- a/core/src/mindustry/world/draw/DrawRegion.java
+++ b/core/src/mindustry/world/draw/DrawRegion.java
@@ -8,7 +8,6 @@ import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.world.*;
 
-/** Not standalone. */
 public class DrawRegion extends DrawBlock{
     public TextureRegion region;
     public String suffix = "";