language is moved inside of options

This commit is contained in:
minjaesong
2019-01-31 03:27:03 +09:00
parent f603b58307
commit d93c6de851
2 changed files with 22 additions and 2 deletions

View File

@@ -4,6 +4,7 @@ import com.badlogic.gdx.ApplicationListener;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Input;
import com.badlogic.gdx.Screen;
import com.badlogic.gdx.assets.AssetManager;
import com.badlogic.gdx.audio.AudioDevice;
import com.badlogic.gdx.backends.lwjgl.LwjglApplication;
import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration;
@@ -22,6 +23,8 @@ import net.torvald.terrarum.imagefont.TinyAlphNum;
import net.torvald.terrarum.modulebasegame.IngameRenderer;
import net.torvald.terrarum.utils.JsonFetcher;
import net.torvald.terrarum.utils.JsonWriter;
import net.torvald.terrarum.worlddrawer.BlocksDrawer;
import net.torvald.terrarum.worlddrawer.LightmapRenderer;
import net.torvald.terrarumsansbitmap.gdx.GameFontBase;
import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack;
import org.lwjgl.input.Controller;
@@ -248,8 +251,12 @@ public class AppLoader implements ApplicationListener {
private FrameBuffer renderFBO;
public static AssetManager assetManager;
@Override
public void create() {
assetManager = new AssetManager();
// set basis of draw
logoBatch = new SpriteBatch();
camera = new OrthographicCamera(((float) appConfig.width), ((float) appConfig.height));
@@ -288,6 +295,9 @@ public class AppLoader implements ApplicationListener {
printdbg(this, e);
}
// make loading list
}
/**
@@ -437,6 +447,13 @@ public class AppLoader implements ApplicationListener {
Terrarum.INSTANCE.dispose();
shaderBayerSkyboxFill.dispose();
shaderHicolour.dispose();
shaderColLUT.dispose();
assetManager.dispose();
fullscreenQuad.dispose();
fontGame.dispose();
fontSmallNumbers.dispose();
@@ -492,6 +509,10 @@ public class AppLoader implements ApplicationListener {
}
BlocksDrawer.INSTANCE.getWorld(); // will initialize the BlocksDrawer by calling dummy method
LightmapRenderer.INSTANCE.hdr(0f);
printdbg(this, "PostInit done");
}

View File

@@ -26,11 +26,10 @@ object UITitleRemoConYaml {
- MENU_CONTROLS_GAMEPAD
- MENU_LABEL_RETURN
- MENU_OPTIONS_SOUND
- MENU_LABEL_LANGUAGE : net.torvald.terrarum.modulebasegame.ui.UITitleLanguage
- MENU_LABEL_RETURN
- MENU_MODULES : net.torvald.terrarum.modulebasegame.ui.UITitleModules
- MENU_LABEL_RETURN
- MENU_LABEL_LANGUAGE : net.torvald.terrarum.modulebasegame.ui.UITitleLanguage
- MENU_LABEL_RETURN
- MENU_LABEL_CREDITS : net.torvald.terrarum.modulebasegame.ui.UITitleCredits
- MENU_LABEL_CREDITS : net.torvald.terrarum.modulebasegame.ui.UITitleCredits
- MENU_CREDIT_GPL_DNT : net.torvald.terrarum.modulebasegame.ui.UITitleGPL3