Better refactor

.gitignore

@@ -167,6 +167,7 @@ ClientBin/
 *.pfx
 *.publishsettings
 node_modules/
+.DS_Store
 
 # RIA/Silverlight projects
 Generated_Code/

CMakeLists.txt

@@ -51,9 +51,10 @@ set( STATIC_BOOST        ON CACHE BOOL ${STATIC_BOOST_DESC} )
 
 if( INCLUDE_PYTHON )
   set( USE_PYTHON_VERSIONS_DESC "Specifies which version of Python to build Malmo with Python bindings" )
+  set( MACOS_USE_PYTHON_MODULE_DESC "Specifies which Python module to build Malmo on Apple MacOS" )
   set( USE_PYTHON_VERSIONS 3.6 CACHE STRING ${USE_PYTHON_VERSIONS_DESC} )
-  set( BOOST_PYTHON_NAME_DESC "Specifies which Boost Python module to build Malmo with" )
-  set( BOOST_PYTHON_NAME "python3" CACHE STRING ${BOOST_PYTHON_NAME_DESC} )
+  # Boost has switched to using a 2 digit naming convention for python on MacOS.
+  set( MACOS_USE_PYTHON_MODULE "python37" CACHE STRING ${MACOS_USE_PYTHON_MODULE_DESC} )
 endif()
 
 set( WARNINGS_AS_ERRORS OFF )
@@ -105,18 +106,21 @@ SET(Boost_ADDITIONAL_VERSIONS "1.67" "1.67.0")
 
 SET(BOOST_PYTHON_MODULE_NAME "python")
 if ( USE_PYTHON_VERSIONS VERSION_GREATER 3 )
-  SET( BOOST_PYTHON_MODULE_NAME ${BOOST_PYTHON_NAME} )
+    if ( APPLE )
+        SET( BOOST_PYTHON_MODULE_NAME ${MACOS_USE_PYTHON_MODULE} )
+    else()
+        SET( BOOST_PYTHON_MODULE_NAME "python3" )
+    endif()
 endif()
 
 if( WIN32 )
   SET(Boost_USE_STATIC_LIBS ON)
-  find_package( Boost COMPONENTS chrono date_time filesystem iostreams program_options ${BOOST_PYTHON_MODULE_NAME} regex system thread REQUIRED )
-  add_definitions(-DBOOST_ALL_NO_LIB=1)  # Turn off auto-linking, creates problems when linking boost statically
+  find_package( Boost COMPONENTS chrono date_time filesystem iostreams program_options ${BOOST_PYTHON_MODULE_NAME} regex system thread zlib REQUIRED )
 else()
-  SET(Boost_USE_STATIC_LIBS ${STATIC_BOOST})
   find_package( Boost COMPONENTS chrono date_time filesystem iostreams program_options ${BOOST_PYTHON_MODULE_NAME} regex system thread REQUIRED )
   set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
   find_package( Threads REQUIRED )
+  SET(Boost_USE_STATIC_LIBS ${STATIC_BOOST})
 endif()
 
 # suggested install paths - see readme.md

Malmo/samples/samples.iml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="minecraft" name="Minecraft">
+      <configuration>
+        <autoDetectTypes>
+          <platformType>MIXIN</platformType>
+        </autoDetectTypes>
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/Java_examples" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="com.microsoft.MalmoMod.Minecraft.main" exported="" />
+    <orderEntry type="module" module-name="com.microsoft.MalmoMod.Minecraft.test" scope="TEST" />
+  </component>
+</module>

Malmo/src/MissionSpec.cpp

@@ -39,6 +39,8 @@ namespace malmo
     const std::vector<std::string> MissionSpec::all_inventory_commands = { "swapInventoryItems", "combineInventoryItems", "discardCurrentItem", 
         "hotbar.1", "hotbar.2", "hotbar.3", "hotbar.4", "hotbar.5", "hotbar.6", "hotbar.7", "hotbar.8", "hotbar.9" };
     const std::vector<std::string> MissionSpec::all_simplecraft_commands = { "craft" };
+    const std::vector<std::string> MissionSpec::all_nearbycraft_commands = { "craftNearby" };
+    const std::vector<std::string> MissionSpec::all_nearbysmelt_commands = { "smeltNearby" };
     const std::vector<std::string> MissionSpec::all_chat_commands = { "chat" };
     const std::vector<std::string> MissionSpec::all_mission_quit_commands = { "quit" };
     const std::vector<std::string> MissionSpec::all_human_level_commands = { "forward", "left", "right", "jump", "sneak", "sprint", "inventory", "swapHands", "drop", "use", "attack", "moveMouse", 
@@ -110,6 +112,7 @@ namespace malmo
             child.erase("FlatWorldGenerator");
             child.erase("FileWorldGenerator");
             child.erase("DefaultWorldGenerator");
+            child.erase("BiomeGenerator");
         }
     }
 
@@ -137,6 +140,11 @@ namespace malmo
         if (defaultWorldGenerator) {
            defaultWorldGenerator.get().put("<xmlattr>.forceReset", true);
         }
+        const auto& biomeWorldGenerator =
+        mission.get_child_optional("Mission.ServerSection.ServerHandlers.BiomeGenerator");
+        if (biomeWorldGenerator) {
+            biomeWorldGenerator.get().put("<xmlattr>.forceReset", true);
+        }
     }
 
     void MissionSpec::setTimeOfDay(int t,bool allowTimeToPass)
@@ -376,6 +384,9 @@ namespace malmo
             child.erase("DiscreteMovementCommands");
             child.erase("AbsoluteMovementCommands");
             child.erase("SimpleCraftCommands");
+            child.erase("NearbyCraftCommands");
+            child.erase("NearbySmeltCommands");
+            child.erase("PlaceCommands");
             child.erase("ChatCommands");
             child.erase("MissionQuitCommands");
         }
@@ -420,11 +431,16 @@ namespace malmo
     {
         addVerbToCommandType(verb, "Mission.AgentSection.AgentHandlers.InventoryCommands");
     }
-   
+
     void MissionSpec::allowAllChatCommands()
     {
         mission.put("Mission.AgentSection.AgentHandlers.ChatCommands", "");
     }
+
+    void MissionSpec::allowAllPlaceCommands()
+    {
+        mission.put("Mission.AgentSection.AgentHandlers.PlaceCommands", "");
+    }
 
     // ------------------------------- information ---------------------------------------------------
 
@@ -522,6 +538,15 @@ namespace malmo
 
                 if (e.second.get_child_optional("AgentHandlers.SimpleCraftCommands"))
                     command_handlers.push_back("SimpleCraft");
+
+                if (e.second.get_child_optional("AgentHandlers.NearbyCraftCommands"))
+                    command_handlers.push_back("NearbyCraft");
+
+                if (e.second.get_child_optional("AgentHandlers.NearbySmeltCommands"))
+                    command_handlers.push_back("NearbySmelt");
+
+                if (e.second.get_child_optional("AgentHandlers.PlaceCommands"))
+                    command_handlers.push_back("Place");
 
                 if (e.second.get_child_optional("AgentHandlers.MissionQuitCommands"))
                     command_handlers.push_back("MissionQuit");
@@ -582,6 +607,12 @@ namespace malmo
                     else if (command_handler == "SimpleCraft") {
                         allowed_commands = all_simplecraft_commands;
                     }
+                    else if (command_handler == "NearbyCraft") {
+                        allowed_commands = all_nearbycraft_commands;
+                    }
+                    else if (command_handler == "NearbySmelt") {
+                        allowed_commands = all_nearbysmelt_commands;
+                    }
                     else if (command_handler == "Chat") {
                         allowed_commands = all_chat_commands;
                     }

Malmo/src/MissionSpec.h

@@ -299,6 +299,10 @@ namespace malmo
             //! Only applies to the first agent in the mission. For multi-agent missions, specify the command handlers for each in the XML.
             void allowAllChatCommands();
 
+            //! Adds a place command handler if none present, with neither an allow-list or a deny-list, thus allowing any command to be sent.
+            //! Only applies to the first agent in the mission. For multi-agent missions, specify the command handlers for each in the XML.
+            void allowAllPlaceCommands();
+
             // ------------------------- information --------------------------------------
 
             //! Returns the short description of the mission.
@@ -382,6 +386,8 @@ namespace malmo
             static const std::vector<std::string> all_discrete_movement_commands;
             static const std::vector<std::string> all_inventory_commands;
             static const std::vector<std::string> all_simplecraft_commands;
+            static const std::vector<std::string> all_nearbycraft_commands;
+            static const std::vector<std::string> all_nearbysmelt_commands;
             static const std::vector<std::string> all_chat_commands;
             static const std::vector<std::string> all_mission_quit_commands;
             static const std::vector<std::string> all_human_level_commands;

MalmoEnv/malmoenv/commands.py

@@ -35,6 +35,8 @@ class CommandParser:
     inventoryCommands = "Inventory"
     chatCommands = "Chat"
     simpleCraftCommands = "SimpleCraft"
+    nearbyCraftCommands = "NearbyCraft"
+    nearbySmeltCommands = "NearbySmelt"
     missionQuitCommands = "MissionQuit"
     humanLevelCommands = "HumanLevel"
 
@@ -50,6 +52,8 @@ class CommandParser:
                      "hotbar.7", "hotbar.8", "hotbar.9"]
     all_chat = ["chat"]
     all_simplecraft = ["craft"]
+    all_nearbycraft = ["nearbyCraft"]
+    all_nearbysmelt = ["nearbySmelt"]
     all_mission_quit = ["quit"]
     all_human_level = ["forward", "left", "right", "jump", "sneak", "sprint", "inventory",
                        "swapHands", "drop", "use", "attack", "moveMouse",
@@ -126,6 +130,14 @@ def get_actions(self, commands):
                 if verb != 'chat':
                     raise CommandHandlerException("Invalid chat command")
                 actions.append(verb)
+            elif type == 'NearbyCraft':
+                if verb != 'nearbyCraft':
+                    raise CommandHandlerException("Invalid nearby craft command")
+                actions.append(verb)
+            elif type == 'NearbySmelt':
+                if verb != 'nearbySmelt':
+                    raise CommandHandlerException("Invalid nearby smelt command")
+                actions.append(verb)
             elif type == 'SimpleCraft':
                 if verb != 'craft':
                     raise CommandHandlerException("Invalid craft command")
@@ -152,6 +164,10 @@ def _command_hander(self, handlers, turnbased, commands):
                 commands.extend(self._add_commands(CommandParser.chatCommands, turnbased, ch))
             elif ch.tag == CommandParser.ns + "SimpleCraftCommands":
                 commands.extend(self._add_commands(CommandParser.simpleCraftCommands, turnbased, ch))
+            elif ch.tag == CommandParser.ns + "NearbyCraftCommands":
+                commands.extend(self._add_commands(CommandParser.nearbyCraftCommands, turnbased, ch))
+            elif ch.tag == CommandParser.ns + "NearbySmeltCommands":
+                commands.extend(self._add_commands(CommandParser.nearbySmeltCommands, turnbased, ch))
             elif ch.tag == CommandParser.ns + "MissionQuitCommands":
                 commands.extend(self._add_commands(CommandParser.missionQuitCommands, turnbased, ch))
             elif ch.tag == CommandParser.ns + "HumanLevelCommands":
@@ -189,6 +205,10 @@ def _fill_command_list(self, command_type, turnbased, allow, deny):
                 allow = [(command_type, turnbased, c) for c in CommandParser.all_human_level]
             elif command_type == CommandParser.simpleCraftCommands:
                 allow = [(command_type, turnbased, c) for c in CommandParser.all_simplecraft]
+            elif command_type == CommandParser.nearbyCraftCommands:
+                allow = [(command_type, turnbased, c) for c in CommandParser.all_nearbycraft]
+            elif command_type == CommandParser.nearbySmeltCommands:
+                allow = [(command_type, turnbased, c) for c in CommandParser.all_nearbysmelt]
             elif command_type == CommandParser.missionQuitCommands:
                 allow = [(command_type, turnbased, c) for c in CommandParser.missionQuitCommands]
             elif command_type == CommandParser.chatCommands:

Minecraft/src/main/java/com/microsoft/Malmo/MalmoMod.java

@@ -19,6 +19,7 @@
 
 package com.microsoft.Malmo;
 
+import com.microsoft.Malmo.MissionHandlers.*;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufInputStream;
 import io.netty.buffer.ByteBufOutputStream;
@@ -57,14 +58,6 @@
 import net.minecraftforge.fml.relauncher.Side;
 
 import com.microsoft.Malmo.Client.MalmoModClient;
-import com.microsoft.Malmo.MissionHandlers.AbsoluteMovementCommandsImplementation;
-import com.microsoft.Malmo.MissionHandlers.DiscreteMovementCommandsImplementation;
-import com.microsoft.Malmo.MissionHandlers.InventoryCommandsImplementation;
-import com.microsoft.Malmo.MissionHandlers.ObservationFromFullInventoryImplementation;
-import com.microsoft.Malmo.MissionHandlers.ObservationFromFullStatsImplementation;
-import com.microsoft.Malmo.MissionHandlers.ObservationFromGridImplementation;
-import com.microsoft.Malmo.MissionHandlers.ObservationFromSystemImplementation;
-import com.microsoft.Malmo.MissionHandlers.SimpleCraftCommandsImplementation;
 import com.microsoft.Malmo.Schemas.MissionInit;
 import com.microsoft.Malmo.Server.MalmoModServer;
 import com.microsoft.Malmo.Utils.AddressHelper;
@@ -134,6 +127,8 @@ public void preInit(FMLPreInitializationEvent event)
         network.registerMessage(ObservationFromGridImplementation.GridRequestMessageHandler.class, ObservationFromGridImplementation.GridRequestMessage.class, 2, Side.SERVER);
         network.registerMessage(MalmoMessageHandler.class, MalmoMessage.class, 3, Side.CLIENT);	// Malmo messages from server to client
         network.registerMessage(SimpleCraftCommandsImplementation.CraftMessageHandler.class, SimpleCraftCommandsImplementation.CraftMessage.class, 4, Side.SERVER);
+        network.registerMessage(NearbyCraftCommandsImplementation.CraftNearbyMessageHandler.class, NearbyCraftCommandsImplementation.CraftNearbyMessage.class, 13, Side.SERVER);
+        network.registerMessage(NearbySmeltCommandsImplementation.SmeltNearbyMessageHandler.class, NearbySmeltCommandsImplementation.SmeltNearbyMessage.class, 14, Side.SERVER);
         network.registerMessage(AbsoluteMovementCommandsImplementation.TeleportMessageHandler.class, AbsoluteMovementCommandsImplementation.TeleportMessage.class, 5, Side.SERVER);
         network.registerMessage(MalmoMessageHandler.class, MalmoMessage.class, 6, Side.SERVER);	// Malmo messages from client to server
         network.registerMessage(InventoryCommandsImplementation.InventoryMessageHandler.class, InventoryCommandsImplementation.InventoryMessage.class, 7, Side.SERVER);