Further conflict resolution: work out clashing logical changes for so…

…me UI workflow plus a block family fix
MovingBlocks · Jun 18, 2018 · 1bbc740 · 1bbc740
1 parent 94a3dc1
commit 1bbc740
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git a/engine/src/main/java/org/terasology/rendering/nui/layers/mainMenu/CreateGameScreen.java b/engine/src/main/java/org/terasology/rendering/nui/layers/mainMenu/CreateGameScreen.java
@@ -91,11 +91,7 @@ public class CreateGameScreen extends CoreScreenLayer {
     @In
     private Config config;
 
-    private boolean loadingAsServer;
-
-    /**
-     * A UniverseWrapper object used here to determine if the game is single-player or multi-player.
-     */
+    /** A UniverseWrapper object used here to determine if the game is single-player or multi-player.*/
     private UniverseWrapper universeWrapper;
 
     @Override

diff --git a/engine/src/main/java/org/terasology/rendering/nui/layers/mainMenu/SelectGameScreen.java b/engine/src/main/java/org/terasology/rendering/nui/layers/mainMenu/SelectGameScreen.java
@@ -200,8 +200,8 @@ public void onOpened() {
         super.onOpened();
 
         if (GameProvider.getSavedGames().isEmpty()) {
-            CreateGameScreen screen = getManager().createScreen(CreateGameScreen.ASSET_URI, CreateGameScreen.class);
-            screen.setLoadingAsServer(isLoadingAsServer());
+            NewGameScreen screen = getManager().createScreen(NewGameScreen.ASSET_URI, NewGameScreen.class);
+            screen.setUniverseWrapper(universeWrapper);
             getManager().pushScreen(screen);
         }
 

diff --git a/engine/src/main/java/org/terasology/rendering/nui/layers/mainMenu/UniverseSetupScreen.java b/engine/src/main/java/org/terasology/rendering/nui/layers/mainMenu/UniverseSetupScreen.java
@@ -55,8 +55,7 @@
 import org.terasology.rendering.nui.skin.UISkinData;
 import org.terasology.rendering.nui.widgets.UIDropdownScrollable;
 import org.terasology.rendering.world.WorldSetupWrapper;
-import org.terasology.world.block.family.BlockFamilyFactoryRegistry;
-import org.terasology.world.block.family.DefaultBlockFamilyFactoryRegistry;
+import org.terasology.world.block.family.BlockFamilyRegistry;
 import org.terasology.world.block.loader.BlockFamilyDefinition;
 import org.terasology.world.block.loader.BlockFamilyDefinitionData;
 import org.terasology.world.block.loader.BlockFamilyDefinitionFormat;
@@ -299,8 +298,8 @@ public void setEnvironment(UniverseWrapper wrapper) {
     }
 
     private void initAssets() {
-        DefaultBlockFamilyFactoryRegistry familyFactoryRegistry = new DefaultBlockFamilyFactoryRegistry();
-        context.put(BlockFamilyFactoryRegistry.class, familyFactoryRegistry);
+        BlockFamilyRegistry familyFactoryRegistry = new BlockFamilyRegistry();
+        context.put(BlockFamilyRegistry.class, familyFactoryRegistry);
 
         // cast lambdas explicitly to avoid inconsistent compiler behavior wrt. type inference
         assetTypeManager.registerCoreAssetType(Prefab.class,