Merge pull request #293 from Bedrock-OSS/develop

Update 1.4.1

Author: Nusiq

local_install.sh

@@ -0,0 +1 @@
+go install -ldflags="-X main.commit=$(git rev-parse HEAD)" github.com/Bedrock-OSS/regolith

main.go

@@ -199,10 +199,23 @@ func main() {
 	eval.Init()
 
 	// Root command
+	versionTitle := "Regolith "
+	if buildSource != "DEV" {
+		versionTitle += version
+	} else {
+		versionTitle += "Dev Build"
+	}
+	if commit != "" {
+		versionTitle += " (#" + commit[0:7]
+		if date != "" {
+			versionTitle += " built at " + date
+		}
+		versionTitle += ")"
+	}
 	var rootCmd = &cobra.Command{
 		Use:     "regolith",
 		Short:   "Addon Compiler for the Bedrock Edition of Minecraft",
-		Long:    regolithDesc,
+		Long:    versionTitle + regolithDesc,
 		Version: version,
 	}
 	subcommands := make([]*cobra.Command, 0)

regolith/export.go

@@ -277,7 +277,7 @@ func ExportProject(ctx RunContext) error {
 	var exportedFilterNames []string
 	for filter := range profile.Filters {
 		filter := profile.Filters[filter]
-		usingDataPath, err := filter.IsUsingDataExport(dotRegolithPath)
+		usingDataPath, err := filter.IsUsingDataExport(dotRegolithPath, ctx)
 		if err != nil {
 			return burrito.WrapErrorf(
 				err,

regolith/filter.go

@@ -215,7 +215,7 @@ type FilterRunner interface {
 
 	// IsUsingDataExport returns whether the filter wants its data to be
 	// exported back to the data folder after running the profile.
-	IsUsingDataExport(dotRegolithPath string) (bool, error)
+	IsUsingDataExport(dotRegolithPath string, ctx RunContext) (bool, error)
 }
 
 func (f *Filter) CopyArguments(parent *RemoteFilter) {
@@ -256,7 +256,7 @@ func (f *Filter) IsDisabled(ctx RunContext) (bool, error) {
 	return false, nil
 }
 
-func (f *Filter) IsUsingDataExport(_ string) (bool, error) {
+func (f *Filter) IsUsingDataExport(_ string, _ RunContext) (bool, error) {
 	return false, nil
 }
 

regolith/filter_profile.go

@@ -40,3 +40,21 @@ func (f *ProfileFilter) Check(context RunContext) error {
 		profile, f.Profile, *context.Config, &context,
 		context.DotRegolithPath)
 }
+
+func (f *ProfileFilter) IsUsingDataExport(dotRegolithPath string, ctx RunContext) (bool, error) {
+	profile := ctx.Config.Profiles[f.Profile]
+	for filter := range profile.Filters {
+		filter := profile.Filters[filter]
+		usingDataPath, err := filter.IsUsingDataExport(dotRegolithPath, ctx)
+		if err != nil {
+			return false, burrito.WrapErrorf(
+				err,
+				"Failed to check if profile is using data export.\n"+
+					"Profile: %s", f.Profile)
+		}
+		if usingDataPath {
+			return true, nil
+		}
+	}
+	return false, nil
+}

regolith/filter_remote.go

@@ -308,7 +308,7 @@ func (f *RemoteFilter) GetCachedVersion(dotRegolithPath string) (*string, error)
 	return &version, nil
 }
 
-func (f *RemoteFilter) IsUsingDataExport(dotRegolithPath string) (bool, error) {
+func (f *RemoteFilter) IsUsingDataExport(dotRegolithPath string, _ RunContext) (bool, error) {
 	// Load the filter.json file
 	filterJsonPath := filepath.Join(f.GetDownloadPath(dotRegolithPath), "filter.json")
 	file, err := os.ReadFile(filterJsonPath)