Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed server crash / Struct annotation begins

Browse Source
This commit is contained in:
Anuken
2019-01-28 15:43:33 -05:00
parent c043664ad6
commit 5a3ec8f407
10 changed files with 157 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java
View File

@@ -138,7 +138,7 @@ public class CustomGameDialog extends FloatingDialog{
}
private void displayGameModeHelp(){
FloatingDialog d = new FloatingDialog(Core.bundle.get("mode.text.help.title"));
FloatingDialog d = new FloatingDialog(Core.bundle.get("mode.help.title"));
d.setFillParent(false);
Table table = new Table();
table.defaults().pad(1f);

21
core/src/io/anuke/mindustry/world/blocks/Floor.java
View File

@@ -14,6 +14,8 @@ import io.anuke.mindustry.type.StatusEffect;
import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.Tile;
import static io.anuke.mindustry.Vars.tilesize;
public class Floor extends Block{
/** number of different variant regions to use */
public int variants;
@@ -49,7 +51,8 @@ public class Floor extends Block{
public float heat = 0f;
/** if true, this block cannot be mined by players. useful for annoying things like sand. */
public boolean playerUnmineable = false;
protected TextureRegion[] variantRegions;
protected TextureRegion[] regions;
protected TextureRegion[][] edges;
public Floor(String name){
super(name);
@@ -62,22 +65,24 @@ public class Floor extends Block{
//load variant regions for drawing
if(variants > 0){
variantRegions = new TextureRegion[variants];
regions = new TextureRegion[variants];
for(int i = 0; i < variants; i++){
variantRegions[i] = Core.atlas.find(name + (i + 1));
regions[i] = Core.atlas.find(name + (i + 1));
}
}else{
variantRegions = new TextureRegion[1];
variantRegions[0] = Core.atlas.find(name);
regions = new TextureRegion[1];
regions[0] = Core.atlas.find(name);
}
region = variantRegions[0];
int size = (int)(tilesize / Draw.scl);
edges = Core.atlas.find(name + "-edge").split(size, size);
region = regions[0];
}
@Override
public TextureRegion[] variantRegions(){
return variantRegions;
return regions;
}
@Override
@@ -93,7 +98,7 @@ public class Floor extends Block{
public void draw(Tile tile){
Mathf.random.setSeed(tile.pos());
Draw.rect(variantRegions[Mathf.randomSeed(tile.pos(), 0, Math.max(0, variantRegions.length - 1))], tile.worldx(), tile.worldy());
Draw.rect(regions[Mathf.randomSeed(tile.pos(), 0, Math.max(0, regions.length - 1))], tile.worldx(), tile.worldy());
}
@Override

2
core/src/io/anuke/mindustry/world/blocks/OreBlock.java
View File

@@ -31,7 +31,7 @@ public class OreBlock extends Floor{
@Override
public void draw(Tile tile){
Draw.rect(variantRegions[Mathf.randomSeed(tile.pos(), 0, Math.max(0, variantRegions.length - 1))], tile.worldx(), tile.worldy());
Draw.rect(regions[Mathf.randomSeed(tile.pos(), 0, Math.max(0, regions.length - 1))], tile.worldx(), tile.worldy());
}
public static Block get(Block floor, Item item){