mirror of
https://github.com/Anuken/Mindustry.git
synced 2024-09-22 05:47:44 +03:00
Cleanup
This commit is contained in:
parent
7b2957ab41
commit
54c406f83d
@ -1,8 +1,6 @@
|
||||
package mindustry.content;
|
||||
|
||||
import arc.*;
|
||||
import arc.graphics.*;
|
||||
import arc.graphics.g2d.*;
|
||||
import arc.struct.*;
|
||||
import mindustry.*;
|
||||
import mindustry.ctype.*;
|
||||
@ -97,36 +95,9 @@ public class Blocks implements ContentList{
|
||||
public void load(){
|
||||
//region environment
|
||||
|
||||
air = new Floor("air"){
|
||||
{
|
||||
alwaysReplace = true;
|
||||
hasShadow = false;
|
||||
useColor = false;
|
||||
wall = this;
|
||||
}
|
||||
air = new AirBlock("air");
|
||||
|
||||
@Override public void drawBase(Tile tile){}
|
||||
@Override public void load(){}
|
||||
@Override public void init(){}
|
||||
@Override public boolean isHidden(){ return true; }
|
||||
|
||||
@Override
|
||||
public TextureRegion[] variantRegions(){
|
||||
if(variantRegions == null){
|
||||
variantRegions = new TextureRegion[]{Core.atlas.find("clear")};
|
||||
}
|
||||
return variantRegions;
|
||||
}
|
||||
};
|
||||
|
||||
spawn = new OverlayFloor("spawn"){
|
||||
{
|
||||
variants = 0;
|
||||
needsSurface = false;
|
||||
}
|
||||
@Override
|
||||
public void drawBase(Tile tile){}
|
||||
};
|
||||
spawn = new SpawnBlock("spawn");
|
||||
|
||||
cliff = new Cliff("cliff"){{
|
||||
inEditor = false;
|
||||
|
@ -8,8 +8,8 @@ import mindustry.gen.*;
|
||||
import mindustry.graphics.*;
|
||||
|
||||
public class LightningBulletType extends BulletType{
|
||||
protected Color lightningColor = Pal.lancerLaser;
|
||||
protected int lightningLength = 25, lightningLengthRand = 0;
|
||||
public Color lightningColor = Pal.lancerLaser;
|
||||
public int lightningLength = 25, lightningLengthRand = 0;
|
||||
|
||||
public LightningBulletType(){
|
||||
super(0.0001f, 1f);
|
||||
|
@ -30,7 +30,7 @@ public class LiquidTurret extends Turret{
|
||||
}
|
||||
|
||||
/** Initializes accepted ammo map. Format: [liquid1, bullet1, liquid2, bullet2...] */
|
||||
protected void ammo(Object... objects){
|
||||
public void ammo(Object... objects){
|
||||
ammoTypes = OrderedMap.of(objects);
|
||||
}
|
||||
|
||||
|
43
core/src/mindustry/world/blocks/environment/AirBlock.java
Normal file
43
core/src/mindustry/world/blocks/environment/AirBlock.java
Normal file
@ -0,0 +1,43 @@
|
||||
package mindustry.world.blocks.environment;
|
||||
|
||||
import arc.*;
|
||||
import arc.graphics.g2d.*;
|
||||
import mindustry.annotations.Annotations.*;
|
||||
import mindustry.world.*;
|
||||
|
||||
public class AirBlock extends Floor{
|
||||
|
||||
public AirBlock(String name){
|
||||
super(name);
|
||||
alwaysReplace = true;
|
||||
hasShadow = false;
|
||||
useColor = false;
|
||||
wall = this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void drawBase(Tile tile){}
|
||||
|
||||
@OverrideCallSuper
|
||||
@Override
|
||||
public void load(){}
|
||||
|
||||
@OverrideCallSuper
|
||||
@Override
|
||||
public void init(){
|
||||
decoration = this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isHidden(){
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TextureRegion[] variantRegions(){
|
||||
if(variantRegions == null){
|
||||
variantRegions = new TextureRegion[]{Core.atlas.find("clear")};
|
||||
}
|
||||
return variantRegions;
|
||||
}
|
||||
}
|
@ -6,7 +6,7 @@ import arc.math.*;
|
||||
import mindustry.world.*;
|
||||
|
||||
public class Boulder extends Block{
|
||||
protected int variants;
|
||||
public int variants;
|
||||
|
||||
public Boulder(String name){
|
||||
super(name);
|
||||
|
15
core/src/mindustry/world/blocks/environment/SpawnBlock.java
Normal file
15
core/src/mindustry/world/blocks/environment/SpawnBlock.java
Normal file
@ -0,0 +1,15 @@
|
||||
package mindustry.world.blocks.environment;
|
||||
|
||||
import mindustry.world.*;
|
||||
|
||||
public class SpawnBlock extends OverlayFloor{
|
||||
|
||||
public SpawnBlock(String name){
|
||||
super(name);
|
||||
variants = 0;
|
||||
needsSurface = false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void drawBase(Tile tile){}
|
||||
}
|
Loading…
Reference in New Issue
Block a user