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

Merge branch 'master' into feature_rich_presence

Browse Source
This commit is contained in:
Jan Polák
2018-01-02 17:26:28 +01:00
committed by GitHub
parent 86802b98c2 d5d03dd759
commit 4a706a8a29
52 changed files with 1898 additions and 760 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/src/io/anuke/mindustry/Mindustry.java
View File

@@ -1,16 +1,13 @@
package io.anuke.mindustry;
import java.util.Date;
import java.util.Locale;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.files.FileHandle;
import com.badlogic.gdx.utils.Array;
import com.badlogic.gdx.utils.I18NBundle;
import io.anuke.mindustry.core.*;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.io.PlatformFunction;
import io.anuke.mindustry.net.Net;
import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.blocks.*;
import io.anuke.ucore.UCore;
@@ -21,6 +18,9 @@ import io.anuke.ucore.function.Callable;
import io.anuke.ucore.modules.ModuleCore;
import io.anuke.ucore.scene.ui.TextField;
import java.util.Date;
import java.util.Locale;
public class Mindustry extends ModuleCore {
public static Callable donationsCallable;
public static boolean hasDiscord = true;
@@ -90,16 +90,9 @@ public class Mindustry extends ModuleCore {
@Override
public void render(){
super.render();
try{
super.render();
}catch (RuntimeException e){
//TODO display error log
//Gdx.app.getClipboard().setContents(e.getMessage());
throw e;
}
if(!GameState.is(State.paused)){
if(!GameState.is(State.paused) || Net.active()){
Timers.update();
}