From bf36a41ce1df460110258c4570e803e65867c303 Mon Sep 17 00:00:00 2001 From: torbuntu Date: Sun, 14 Feb 2021 15:54:49 -0600 Subject: [PATCH] -- Upgrade libraries --- build.gradle | 2 +- .../java/leikr/screens/NewProgramScreen.java | 40 +++++++++---------- 2 files changed, 19 insertions(+), 23 deletions(-) diff --git a/build.gradle b/build.gradle index 0a668248..7c4cea1d 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ allprojects { ext { appName = 'Leikr' - mini2DxVersion = '2.0.0-alpha.42' + mini2DxVersion = '2.0.0-alpha.44' groovyVersion = '4.0.0-alpha-2' gdxVersion = '1.9.13' lwjglVersion = '3.2.3' diff --git a/core/src/main/java/leikr/screens/NewProgramScreen.java b/core/src/main/java/leikr/screens/NewProgramScreen.java index 7cd2398b..e0b07099 100644 --- a/core/src/main/java/leikr/screens/NewProgramScreen.java +++ b/core/src/main/java/leikr/screens/NewProgramScreen.java @@ -40,36 +40,15 @@ public class NewProgramScreen extends BasicGameScreen { public static int ID = 5; + private static GeneratorStep generatorStep; String prompt; String name; String template; String errorMessage; - private String newLocation; private final FitViewport viewport; - private final NewProgramGenerator generator; - protected enum GeneratorStep { - NAME, - TEMPLATE, - TITLE, - TYPE, - AUTHOR, - VERSION, - PLAYERS, - ABOUT, - MAX_SPRITES, - COMPILE_SOURCE, - USE_COMPILED, - CREATE, - FINISHED, - BACK, - ERROR - } - - private static GeneratorStep generatorStep; - public NewProgramScreen(FitViewport vp, GameRuntime runtime) { viewport = vp; generator = new NewProgramGenerator(runtime); @@ -297,5 +276,22 @@ void progressStep() { public int getId() { return ID; } + protected enum GeneratorStep { + NAME, + TEMPLATE, + TITLE, + TYPE, + AUTHOR, + VERSION, + PLAYERS, + ABOUT, + MAX_SPRITES, + COMPILE_SOURCE, + USE_COMPILED, + CREATE, + FINISHED, + BACK, + ERROR + } }