Remove modRules widget logic argument.

OpenRA.Game/Widgets/WidgetLoader.cs

@@ -46,9 +46,6 @@ namespace OpenRA
 
 		public Widget LoadWidget(WidgetArgs args, Widget parent, MiniYamlNode node)
 		{
-			if (!args.ContainsKey("modRules"))
-				args = new WidgetArgs(args) { { "modRules", modData.DefaultRules } };
-
 			if (!args.ContainsKey("modData"))
 				args = new WidgetArgs(args) { { "modData", modData } };
 

OpenRA.Mods.Common/Widgets/ButtonWidget.cs

@@ -60,9 +60,9 @@ namespace OpenRA.Mods.Common.Widgets
 		protected readonly Ruleset ModRules;
 
 		[ObjectCreator.UseCtor]
-		public ButtonWidget(Ruleset modRules)
+		public ButtonWidget(ModData modData)
 		{
-			ModRules = modRules;
+			ModRules = modData.DefaultRules;
 
 			GetText = () => Text;
 			GetColor = () => TextColor;

OpenRA.Mods.Common/Widgets/CheckboxWidget.cs

@@ -25,8 +25,8 @@ namespace OpenRA.Mods.Common.Widgets
 		public bool HasPressedState = ChromeMetrics.Get<bool>("CheckboxPressedState");
 
 		[ObjectCreator.UseCtor]
-		public CheckboxWidget(Ruleset modRules)
+		public CheckboxWidget(ModData modData)
-			: base(modRules)
+			: base(modData)
 		{
 			GetCheckType = () => CheckType;
 		}

OpenRA.Mods.Common/Widgets/DropDownButtonWidget.cs

@@ -29,8 +29,8 @@ namespace OpenRA.Mods.Common.Widgets
 		public string PanelRoot;
 
 		[ObjectCreator.UseCtor]
-		public DropDownButtonWidget(Ruleset modRules)
+		public DropDownButtonWidget(ModData modData)
-			: base(modRules) { }
+			: base(modData) { }
 
 		protected DropDownButtonWidget(DropDownButtonWidget widget)
 			: base(widget)

OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameChatLogic.cs

@@ -39,10 +39,10 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 		bool teamChat;
 
 		[ObjectCreator.UseCtor]
-		public IngameChatLogic(Widget widget, OrderManager orderManager, World world, Ruleset modRules)
+		public IngameChatLogic(Widget widget, OrderManager orderManager, World world, ModData modData)
 		{
 			this.orderManager = orderManager;
-			this.modRules = modRules;
+			this.modRules = modData.DefaultRules;
 
 			chatTraits = world.WorldActor.TraitsImplementing<INotifyChat>().ToArray();
 

OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyLogic.cs

@@ -112,7 +112,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 
 		[ObjectCreator.UseCtor]
 		internal LobbyLogic(Widget widget, ModData modData, WorldRenderer worldRenderer, OrderManager orderManager,
-			Action onExit, Action onStart, bool skirmishMode, Ruleset modRules)
+			Action onExit, Action onStart, bool skirmishMode)
 		{
 			MapPreview = MapCache.UnknownMap;
 			lobby = widget;
@@ -121,7 +121,9 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 			this.onStart = onStart;
 			this.onExit = onExit;
 			this.skirmishMode = skirmishMode;
-			this.modRules = modRules;
+
+			// TODO: This needs to be reworked to support per-map tech levels, bots, etc.
+			this.modRules = modData.DefaultRules;
 			shellmapWorld = worldRenderer.World;
 
 			orderManager.AddChatLine += AddChatLine;

OpenRA.Mods.Common/Widgets/Logic/MusicPlayerLogic.cs

@@ -26,7 +26,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 		MusicInfo currentSong = null;
 
 		[ObjectCreator.UseCtor]
-		public MusicPlayerLogic(Widget widget, ModData modData, Ruleset modRules, World world, Action onExit)
+		public MusicPlayerLogic(Widget widget, ModData modData, World world, Action onExit)
 		{
 			var panel = widget;
 
@@ -112,7 +112,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 					Game.RunAfterTick(() => Game.InitializeMod("modchooser", new Arguments(args)));
 
 				var installData = modData.Manifest.Get<ContentInstaller>();
-				installButton.IsVisible = () => modRules.InstalledMusic.ToArray().Length <= installData.ShippedSoundtracks;
+				installButton.IsVisible = () => modData.DefaultRules.InstalledMusic.ToArray().Length <= installData.ShippedSoundtracks;
 			}
 
 			var songWatcher = widget.GetOrNull<LogicTickerWidget>("SONG_WATCHER");

OpenRA.Mods.Common/Widgets/MenuButtonWidget.cs

@@ -18,8 +18,8 @@ namespace OpenRA.Mods.Common.Widgets
 		public readonly bool HideIngameUI = true;
 
 		[ObjectCreator.UseCtor]
-		public MenuButtonWidget(Ruleset modRules)
+		public MenuButtonWidget(ModData modData)
-			: base(modRules) { }
+			: base(modData) { }
 
 		protected MenuButtonWidget(MenuButtonWidget other)
 			: base(other)

OpenRA.Mods.Common/Widgets/ProductionTypeButtonWidget.cs

@@ -17,8 +17,8 @@ namespace OpenRA.Mods.Common.Widgets
 		public readonly string HotkeyName;
 
 		[ObjectCreator.UseCtor]
-		public ProductionTypeButtonWidget(Ruleset modRules)
+		public ProductionTypeButtonWidget(ModData modData)
-			: base(modRules) { }
+			: base(modData) { }
 
 		protected ProductionTypeButtonWidget(ProductionTypeButtonWidget other)
 			: base(other)

OpenRA.Mods.Common/Widgets/ScrollItemWidget.cs

@@ -20,8 +20,8 @@ namespace OpenRA.Mods.Common.Widgets
 		public string BaseName = "scrollitem";
 
 		[ObjectCreator.UseCtor]
-		public ScrollItemWidget(Ruleset modRules)
+		public ScrollItemWidget(ModData modData)
-			: base(modRules)
+			: base(modData)
 		{
 			IsVisible = () => false;
 			VisualHeight = 0;

OpenRA.Mods.Common/Widgets/ScrollPanelWidget.cs

@@ -86,9 +86,9 @@ namespace OpenRA.Mods.Common.Widgets
 		}
 
 		[ObjectCreator.UseCtor]
-		public ScrollPanelWidget(Ruleset modRules)
+		public ScrollPanelWidget(ModData modData)
 		{
-			this.modRules = modRules;
+			this.modRules = modData.DefaultRules;
 
 			Layout = new ListLayout(this);
 		}