Merge pull request #325 from Bedrock-OSS/develop

Regolith 1.5.2

Author: Nusiq

.github/workflows/deploy-docs.yml

@@ -56,6 +56,10 @@ func copyFileSecurityInfo(source string, target string) error {
 // FindStandardMojangDir returns path to the com.mojang folder in the standard
 // Minecraft build.
 func FindStandardMojangDir() (string, error) {
+	comMojang := os.Getenv("COM_MOJANG")
+	if comMojang != "" {
+		return comMojang, nil
+	}
 	result := filepath.Join(
 		os.Getenv("LOCALAPPDATA"), "Packages",
 		"Microsoft.MinecraftUWP_8wekyb3d8bbwe", "LocalState", "games",
@@ -72,6 +76,10 @@ func FindStandardMojangDir() (string, error) {
 // FindPreviewDir returns path to the com.mojang folder in the preview
 // Minecraft build.
 func FindPreviewDir() (string, error) {
+	comMojang := os.Getenv("COM_MOJANG_PREVIEW")
+	if comMojang != "" {
+		return comMojang, nil
+	}
 	result := filepath.Join(
 		os.Getenv("LOCALAPPDATA"), "Packages",
 		"Microsoft.MinecraftWindowsBeta_8wekyb3d8bbwe", "LocalState", "games",
@@ -89,6 +97,10 @@ func FindPreviewDir() (string, error) {
 // FindEducationDir returns path to the com.mojang folder in the education
 // edition Minecraft build.
 func FindEducationDir() (string, error) {
+	comMojang := os.Getenv("COM_MOJANG_EDU")
+	if comMojang != "" {
+		return comMojang, nil
+	}
 	result := filepath.Join(
 		os.Getenv("APPDATA"), "Minecraft Education Edition", "games",
 		"com.mojang")

regolith/compatibility_windows.go

@@ -38,7 +38,8 @@ func PythonFilterDefinitionFromObject(id string, obj map[string]interface{}) (*P
 		return nil, burrito.WrappedErrorf(jsonPropertyTypeError, "script", "string")
 	}
 	filter.Script = script
-	filter.VenvSlot, _ = obj["venvSlot"].(int) // default venvSlot is 0
+	venvSlot64, _ := obj["venvSlot"].(float64) // default venvSlot is 0.0
+	filter.VenvSlot = int(venvSlot64)
 
 	requirementsObj, ok := obj["requirements"]
 	if ok {

regolith/filter_python.go

@@ -46,7 +46,8 @@ func RemoteFilterDefinitionFromObject(id string, obj map[string]interface{}) (*R
 		return nil, burrito.WrappedErrorf(jsonPropertyTypeError, "version", "string")
 	}
 	result.Version = version
-	result.VenvSlot, _ = obj["venvSlot"].(int) // default venvSlot is 0
+	venvSlot64, _ := obj["venvSlot"].(float64) // default venvSlot is 0.0
+	result.VenvSlot = int(venvSlot64)
 
 	return result, nil
 }