non-functional loading screen

This commit is contained in:
Anuken
2019-08-26 22:53:11 -04:00
parent 1fc9c82aaf
commit 76cd7ba8d1
211 changed files with 722 additions and 699 deletions
@@ -1,6 +1,6 @@
package io.anuke.mindustry.game;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.Min;
import io.anuke.mindustry.type.ContentType;
@@ -9,8 +9,8 @@ public abstract class Content{
public final short id;
public Content(){
this.id = (short)Vars.content.getBy(getContentType()).size;
Vars.content.handleContent(this);
this.id = (short)Min.content.getBy(getContentType()).size;
Min.content.handleContent(this);
}
/**
@@ -19,7 +19,7 @@ public abstract class Content{
*/
public abstract ContentType getContentType();
/** Called after all content is created. Do not use to load regions or texture data! */
/** Called after all content and modules are created. Do not use to load regions or texture data! */
public void init(){
}
@@ -4,7 +4,7 @@ import io.anuke.arc.*;
import io.anuke.arc.function.*;
import io.anuke.mindustry.maps.*;
import static io.anuke.mindustry.Vars.waveTeam;
import static io.anuke.mindustry.Min.waveTeam;
/** Defines preset rule sets. */
public enum Gamemode{
@@ -7,7 +7,7 @@ import io.anuke.mindustry.content.*;
import io.anuke.mindustry.game.EventType.*;
import io.anuke.mindustry.type.*;
import static io.anuke.mindustry.Vars.*;
import static io.anuke.mindustry.Min.*;
/** Stores player unlocks. Clientside only. */
public class GlobalData{
@@ -106,7 +106,7 @@ public class GlobalData{
@SuppressWarnings("unchecked")
public void load(){
unlocked = Core.settings.getObject("unlocks", ObjectMap.class, ObjectMap::new);
for(Item item : Vars.content.items()){
for(Item item : Min.content.items()){
items.put(item, Core.settings.getInt("item-" + item.name, 0));
}
@@ -118,7 +118,7 @@ public class GlobalData{
public void save(){
Core.settings.putObject("unlocks", unlocked);
for(Item item : Vars.content.items()){
for(Item item : Min.content.items()){
Core.settings.put("item-" + item.name, items.get(item, 0));
}
Core.settings.save();
@@ -11,7 +11,7 @@ public class LoopControl{
private ObjectMap<Sound, SoundData> sounds = new ObjectMap<>();
public void play(Sound sound, Position pos, float volume){
if(Vars.headless) return;
if(Min.headless) return;
float baseVol = sound.calcFalloff(pos.getX(), pos.getY());
float vol = baseVol * volume;
@@ -10,7 +10,7 @@ import io.anuke.mindustry.core.GameState.*;
import io.anuke.mindustry.game.EventType.*;
import io.anuke.mindustry.gen.*;
import static io.anuke.mindustry.Vars.*;
import static io.anuke.mindustry.Min.*;
/** Controls playback of multiple music tracks.*/
public class MusicControl{
+2 -2
View File
@@ -17,8 +17,8 @@ import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Date;
import static io.anuke.mindustry.Vars.saveExtension;
import static io.anuke.mindustry.Vars.state;
import static io.anuke.mindustry.Min.saveExtension;
import static io.anuke.mindustry.Min.state;
public class Saves{
private int nextSlot;
@@ -6,7 +6,7 @@ import io.anuke.arc.util.serialization.JsonValue;
import io.anuke.mindustry.entities.type.BaseUnit;
import io.anuke.mindustry.type.*;
import static io.anuke.mindustry.Vars.content;
import static io.anuke.mindustry.Min.content;
/**
* A spawn group defines spawn information for a specific type of unit, with optional extra information like
+2 -2
View File
@@ -2,7 +2,7 @@ package io.anuke.mindustry.game;
import io.anuke.annotations.Annotations.Struct;
import io.anuke.arc.collection.*;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.Min;
import io.anuke.mindustry.world.Tile;
/** Class for various team-based utilities. */
@@ -29,7 +29,7 @@ public class Teams{
/** Returns whether a team is active, e.g. whether it has any cores remaining. */
public boolean isActive(Team team){
//the enemy wave team is always active
return team == Vars.waveTeam || get(team).cores.size > 0;
return team == Min.waveTeam || get(team).cores.size > 0;
}
/** Returns a set of all teams that are enemies of this team. */
@@ -15,7 +15,7 @@ import io.anuke.mindustry.graphics.*;
import io.anuke.mindustry.type.*;
import io.anuke.mindustry.world.*;
import static io.anuke.mindustry.Vars.*;
import static io.anuke.mindustry.Min.*;
/** Handles tutorial state. */
public class Tutorial{
@@ -161,7 +161,7 @@ public class Tutorial{
}
},
deposit(() -> event("deposit")),
waves(() -> state.wave > 2 && state.enemies() <= 0 && !world.spawner.isSpawning()){
waves(() -> state.wave > 2 && state.enemies() <= 0 && !spawner.isSpawning()){
void begin(){
state.rules.waveTimer = true;
logic.runWave();
@@ -3,7 +3,7 @@ package io.anuke.mindustry.game;
import io.anuke.arc.Core;
import io.anuke.arc.graphics.g2d.TextureRegion;
import io.anuke.arc.scene.ui.layout.Table;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.Min;
/** Base interface for an unlockable content type. */
public abstract class UnlockableContent extends MappableContent{
@@ -42,7 +42,7 @@ public abstract class UnlockableContent extends MappableContent{
}
public final boolean unlocked(){
return Vars.data.isUnlocked(this);
return Min.data.isUnlocked(this);
}
public final boolean locked(){