More cleanup

core/src/mindustry/content/Blocks.java

@@ -10,7 +10,6 @@ import mindustry.*;
 import mindustry.ctype.*;
 import mindustry.entities.*;
 import mindustry.entities.bullet.*;
-import mindustry.entities.type.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.type.*;
@@ -585,7 +584,7 @@ public class Blocks implements ContentList{
             drawIcons = () -> new TextureRegion[]{Core.atlas.find(name + "-bottom"), Core.atlas.find(name + "-top")};
 
             drawer = tile -> {
-                LiquidModule mod = tile.entity.liquids;
+                LiquidModule mod = tile.entity.getLiquids();
 
                 int rotation = rotate ? tile.rotation() * 90 : 0;
 
@@ -681,7 +680,7 @@ public class Blocks implements ContentList{
 
                 Draw.rect(region, tile.drawx(), tile.drawy());
                 Draw.rect(reg(frameRegions[(int)Mathf.absin(entity.totalProgress, 5f, 2.999f)]), tile.drawx(), tile.drawy());
-                Draw.color(Color.clear, tile.entity.liquids.current().color, tile.entity.liquids.total() / liquidCapacity);
+                Draw.color(Color.clear, tile.entity.getLiquids().current().color, tile.entity.getLiquids().total() / liquidCapacity);
                 Draw.rect(reg(liquidRegion), tile.drawx(), tile.drawy());
                 Draw.color();
                 Draw.rect(reg(topRegion), tile.drawx(), tile.drawy());
@@ -1536,14 +1535,14 @@ public class Blocks implements ContentList{
                 }
 
                 @Override
-                public void init(mindustry.entities.type.Bullet b){
+                public void init(Bulletc b){
                     for(int i = 0; i < rays; i++){
                         Damage.collideLine(b, b.getTeam(), hitEffect, b.x, b.y, b.rot(), rayLength - Math.abs(i - (rays / 2)) * 20f);
                     }
                 }
 
                 @Override
-                public void draw(Bullet b){
+                public void draw(Bulletc b){
                     super.draw(b);
                     Draw.color(Color.white, Pal.lancerLaser, b.fin());
                     //Draw.alpha(b.fout());

core/src/mindustry/content/Bullets.java

@@ -9,6 +9,7 @@ import mindustry.entities.*;
 import mindustry.entities.bullet.*;
 import mindustry.entities.effect.*;
 import mindustry.entities.type.*;
+import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.world.*;
 
@@ -410,19 +411,19 @@ public class Bullets implements ContentList{
             }
 
             @Override
-            public void init(Bullet b){
+            public void init(Bulletc b){
                 b.velocity().setLength(0.6f + Mathf.random(2f));
             }
 
             @Override
-            public void draw(Bullet b){
+            public void draw(Bulletc b){
                 Draw.color(Pal.lightFlame, Pal.darkFlame, Color.gray, b.fin());
                 Fill.circle(b.x, b.y, 3f * b.fout());
                 Draw.reset();
             }
 
             @Override
-            public void update(Bullet b){
+            public void update(Bulletc b){
                 if(Mathf.chance(0.04 * Time.delta())){
                     Tile tile = world.tileWorld(b.x, b.y);
                     if(tile != null){
@@ -461,7 +462,7 @@ public class Bullets implements ContentList{
             }
 
             @Override
-            public void draw(Bullet b){
+            public void draw(Bulletc b){
             }
         };
 
@@ -480,7 +481,7 @@ public class Bullets implements ContentList{
             }
 
             @Override
-            public void draw(Bullet b){
+            public void draw(Bulletc b){
             }
         };
 
@@ -510,7 +511,7 @@ public class Bullets implements ContentList{
             }
 
             @Override
-            public void update(Bullet b){
+            public void update(Bulletc b){
                 if(b.timer.get(1, 5f)){
                     Damage.collideLine(b, b.getTeam(), hitEffect, b.x, b.y, b.rot(), length, true);
                 }
@@ -518,7 +519,7 @@ public class Bullets implements ContentList{
             }
 
             @Override
-            public void hit(Bullet b, float hitx, float hity){
+            public void hit(Bulletc b, float hitx, float hity){
                 hitEffect.at(colors[2], hitx, hity);
                 if(Mathf.chance(0.4)){
                     Fire.create(world.tileWorld(hitx + Mathf.range(5f), hity + Mathf.range(5f)));
@@ -526,7 +527,7 @@ public class Bullets implements ContentList{
             }
 
             @Override
-            public void draw(Bullet b){
+            public void draw(Bulletc b){
                 float baseLen = (length) * b.fout();
 
                 Lines.lineAngle(b.x, b.y, b.rot(), baseLen);
@@ -581,11 +582,11 @@ public class Bullets implements ContentList{
             }
 
             @Override
-            public void draw(Bullet b){
+            public void draw(Bulletc b){
             }
 
             @Override
-            public void init(Bullet b){
+            public void init(Bulletc b){
                 Lightning.create(b.getTeam(), Pal.lancerLaser, damage * (b.getOwner() instanceof Player ? state.rules.playerDamageMultiplier : 1f), b.x, b.y, b.rot(), 30);
             }
         };
@@ -634,7 +635,7 @@ public class Bullets implements ContentList{
             }
 
             @Override
-            public void hit(Bullet b, float x, float y){
+            public void hit(Bulletc b, float x, float y){
                 super.hit(b, x, y);
 
                 for(int i = 0; i < 3; i++){