Remove output titles (#1580)

* Remove output title * Remove output title * Remove title output * Remove output title * Remove output title * Format * Remove title being required * Add embedded title
Epix-Incorporated · Aug 11, 2024 · 99be9a8 · 99be9a8
1 parent 4ba0d94
commit 99be9a8
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 27 deletions.
diff --git a/MainModule/Client/UI/Aero/Output.rbxmx b/MainModule/Client/UI/Aero/Output.rbxmx
@@ -326,11 +326,7 @@ return function(data, env)
 			end
 		end
 	end
-	local formattedMessage = msg
-	if title and title ~= "" then 
-		formattedMessage = `<b>{title}</b>: {msg}`
-	end
-	t2.Text = formattedMessage
+	t2.Text = msg
 	if color then
 		t2.TextColor3 = color
 	end

diff --git a/MainModule/Client/UI/Default/Output.rbxmx b/MainModule/Client/UI/Default/Output.rbxmx
@@ -270,13 +270,6 @@ return function(data, env)
 	local messageData = data.Message
 	local titleData = data.Title or ""
 	local colorIn = data.Color
-
-	local formattedMessage
-	if titleData and titleData ~= "" then 
-		formattedMessage = `<b>{titleData}</b>: {messageData}`
-	else
-		formattedMessage = messageData
-	end
 
 	local found = client.UI.Get("Output")
 	if found then
@@ -288,7 +281,7 @@ return function(data, env)
 		end
 	end
 
-	messageLabel.Text = formattedMessage
+	messageLabel.Text = messageData
 	messageLabel.Font = Enum.Font.SourceSans
 	if data.Color then
 		messageLabel.TextColor3 = data.Color

diff --git a/MainModule/Client/UI/Rounded/Output.rbxmx b/MainModule/Client/UI/Rounded/Output.rbxmx
@@ -434,16 +434,17 @@ return function(data, env)
 			end
 		end
 	end--]]
-
-	if title and title ~= "" then t1.Text = title end
+	if title and title ~= "" then
+		t1.Text = title
+	end
 	t2.Text = msg
 	t2.Font = "SourceSans"
 	if color then
 		t2.TextColor3 = color
 	end
 	--t2.Position = UDim2.new(0, 0, 0.35, 0)
 	gTable.Ready()
-	wait(5)
+	task.wait(5)
 	gTable.Destroy()
 end]]></ProtectedString>
 					<int64 name="SourceAssetId">-1</int64>

diff --git a/MainModule/Client/UI/Steampunk/Output.rbxmx b/MainModule/Client/UI/Steampunk/Output.rbxmx
@@ -322,9 +322,8 @@ return function(data, env)
 			end
 		end
 	end
-	local formattedMessage = msg
-	if title and title ~= "" then formattedMessage = `<b>{title}</b>: {msg}` end
-	t2.Text = formattedMessage
+
+	t2.Text = msg
 	t2.Font = "Arial"
 	if color then
 		t2.TextColor3 = color

diff --git a/MainModule/Client/UI/Unity/Output.rbxmx b/MainModule/Client/UI/Unity/Output.rbxmx
@@ -432,10 +432,8 @@ return function(data, env)
 	t2.TextColor3 = color
 	main.BackgroundColor3 = color
 
-	local formattedMessage = msg
-	if title and title ~= "" then formattedMessage = `<b>{title}</b>: {msg}` end
-	t2.Text = formattedMessage
-	t2.Font = "Gotham"
+	t2.Text = msg
+	t2.FontFace = Font.new("rbxasset://fonts/families/Montserrat.json")
 	consoleOpenTween:Play()
 	--t2.Position = UDim2.new(0, 0, 0.35, 0)
 	gTable.Ready()

diff --git a/MainModule/Client/UI/Windows XP/Output.rbxmx b/MainModule/Client/UI/Windows XP/Output.rbxmx
@@ -1964,7 +1964,9 @@ return function(data, env)
 		end
 	end
 
-	if title and title ~= "" then titleTextBox.Text = title else titleTextBox.Text = "Error" end
+	if title and title ~= "" then 
+		titleTextBox.Text = title else titleTextBox.Text = "Error" 
+	end
 
 	errorTextBox.Text = message
 	if color then

diff --git a/MainModule/Server/Commands/Creators.luau b/MainModule/Server/Commands/Creators.luau
@@ -288,7 +288,7 @@ return function(Vargs, env)
 								oError(string.format("bad argument #2 to 'error' (number expected, got %s)", type(level)), 2)
 							end
 
-							Remote.MakeGui(plr, "Output",{Title = "LUA_DEMAND_ERROR"; Message = `{reason}`})
+							Remote.MakeGui(plr, "Output",{Title = "LUA_DEMAND_ERROR"; Message = `LUA_DEMAND_ERROR: {reason}`})
 							oError(`Adonis ScriptEditor error: {reason}`, (level or 1) + 1)
 						end;
 					})
@@ -300,9 +300,9 @@ return function(Vargs, env)
 								func()
 							end)
 
-							Remote.MakeGui(plr,'Output',{Title = 'ScriptEditor error'; Message = Err})
+							Remote.MakeGui(plr,'Output',{Title = 'ScriptEditor error'; Message = `ScriptEditor error: {Err}`})
 						else
-							Remote.MakeGui(plr,'Output',{Title = 'ScriptEditor error'; Message = err})
+							Remote.MakeGui(plr,'Output',{Title = 'ScriptEditor error'; Message = `ScriptEditor error: {err}`})
 						end
 					end)
 				end